X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdevice%2Ffile.cpp;h=e82c5ece16c89e8f7d00da6da9fcb3bdda4506b9;hb=6842b5fc481eb43d9aeea81f17e211820d6dc405;hp=190b53846bc08071d60df99cd1e759b070b060be;hpb=ae2d1bc5b5aba9fcdd7fef42ef1bc9069267d6f7;p=pulseview.git

diff --git a/pv/device/file.cpp b/pv/device/file.cpp
index 190b538..e82c5ec 100644
--- a/pv/device/file.cpp
+++ b/pv/device/file.cpp
@@ -19,11 +19,14 @@
  */
 
 #include "file.h"
-#include "inputfile.h"
 #include "sessionfile.h"
 
+#include <boost/filesystem.hpp>
+
 #include <libsigrok/libsigrok.h>
 
+using std::make_pair;
+using std::map;
 using std::string;
 
 namespace pv {
@@ -36,15 +39,27 @@ File::File(const std::string path) :
 
 std::string File::format_device_title() const
 {
-	return _path;
+	return boost::filesystem::path(_path).filename().string();
+}
+
+map<string, string> File::get_device_info() const
+{
+	map<string, string> result;
+
+	result.insert(make_pair("vendor", "sigrok"));
+	result.insert(make_pair("model", "file"));
+	result.insert(make_pair("connection_id",
+			boost::filesystem::path(_path).filename().string()));
+
+	return result;
 }
 
 File* File::create(const string &name)
 {
-	if (sr_session_load(name.c_str()) == SR_OK) {
+	if (sr_session_load(name.c_str(), &SigSession::_sr_session) == SR_OK) {
 		GSList *devlist = NULL;
-		sr_session_dev_list(&devlist);
-		sr_session_destroy();
+		sr_session_dev_list(SigSession::_sr_session, &devlist);
+		sr_session_destroy(SigSession::_sr_session);
 
 		if (devlist) {
 			sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
@@ -57,7 +72,7 @@ File* File::create(const string &name)
 		}
 	}
 
-	return new InputFile(name);
+	return NULL;
 }
 
 } // device