X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevice%2Ffile.cpp;h=edc2da2bdd96cad6ba3a56eb39d13c2a1a2b2e4e;hb=ab973f4729258b729d2aa84abfa14b61609fa35e;hp=190b53846bc08071d60df99cd1e759b070b060be;hpb=ae2d1bc5b5aba9fcdd7fef42ef1bc9069267d6f7;p=pulseview.git diff --git a/pv/device/file.cpp b/pv/device/file.cpp index 190b538..edc2da2 100644 --- a/pv/device/file.cpp +++ b/pv/device/file.cpp @@ -19,9 +19,10 @@ */ #include "file.h" -#include "inputfile.h" #include "sessionfile.h" +#include + #include using std::string; @@ -36,15 +37,15 @@ File::File(const std::string path) : std::string File::format_device_title() const { - return _path; + return boost::filesystem::path(_path).filename().string(); } 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 +58,7 @@ File* File::create(const string &name) } } - return new InputFile(name); + return NULL; } } // device