projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove obsolete input module support.
[pulseview.git]
/
pv
/
device
/
file.cpp
diff --git
a/pv/device/file.cpp
b/pv/device/file.cpp
index e33be854af1922680b8dae89bfe1581caadaace6..edc2da2bdd96cad6ba3a56eb39d13c2a1a2b2e4e 100644
(file)
--- a/
pv/device/file.cpp
+++ b/
pv/device/file.cpp
@@
-19,7
+19,6
@@
*/
#include "file.h"
*/
#include "file.h"
-#include "inputfile.h"
#include "sessionfile.h"
#include <boost/filesystem.hpp>
#include "sessionfile.h"
#include <boost/filesystem.hpp>
@@
-43,10
+42,10
@@
std::string File::format_device_title() const
File* File::create(const string &name)
{
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;
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;
if (devlist) {
sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
@@
-59,7
+58,7
@@
File* File::create(const string &name)
}
}
}
}
- return
new InputFile(name)
;
+ return
NULL
;
}
} // device
}
} // device