* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifdef ENABLE_DECODE
#include <libsigrokdecode/libsigrokdecode.h>
+#endif
#include "sigsession.h"
#include <QDebug>
-using namespace boost;
-using namespace std;
+using boost::dynamic_pointer_cast;
+using boost::function;
+using boost::lock_guard;
+using boost::mutex;
+using boost::shared_ptr;
+using std::map;
+using std::string;
+using std::vector;
namespace pv {
void SigSession::set_device(struct sr_dev_inst *sdi)
{
+ // Ensure we are not capturing before setting the device
+ stop_capture();
+
if (_sdi)
_device_manager.release_device(_sdi);
if (sdi)
return _logic_data;
}
+#ifdef ENABLE_DECODE
bool SigSession::add_decoder(srd_decoder *const dec)
{
map<const srd_probe*, shared_ptr<view::LogicSignal> > probes;
{
shared_ptr<view::LogicSignal> l =
dynamic_pointer_cast<view::LogicSignal>(s);
- if (l && QString(probe->name).toLower().contains(
+ if (l && QString::fromUtf8(probe->name).
+ toLower().contains(
l->get_name().toLower()))
probes[probe] = l;
}
return;
}
}
+#endif
void SigSession::set_capture_state(capture_state state)
{