X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=c152481e9841814d93669c8c85e3cccf2176e94c;hb=65a53225414471cb2701db2429aa3ab9e74e5b21;hp=b93ecc85952ecc4053169782bd666bdd06cd968f;hpb=1f3740351a99b9c5cb4cb8a3537e27db9f2e6f60;p=pulseview.git diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp index b93ecc8..c152481 100644 --- a/pv/sigsession.cpp +++ b/pv/sigsession.cpp @@ -126,6 +126,28 @@ void SigSession::set_file(const string &name) throw(QString) set_device(shared_ptr(device::File::create(name))); } +void SigSession::set_default_device() +{ + shared_ptr default_device; + const list< shared_ptr > &devices = + _device_manager.devices(); + + if (!devices.empty()) { + // Fall back to the first device in the list. + default_device = devices.front(); + + // Try and find the demo device and select that by default + BOOST_FOREACH (shared_ptr dev, devices) + if (strcmp(dev->dev_inst()->driver->name, + "demo") == 0) { + default_device = dev; + break; + } + } + + set_device(default_device); +} + void SigSession::release_device(device::DevInst *dev_inst) { (void)dev_inst; @@ -290,28 +312,6 @@ void SigSession::set_capture_state(capture_state state) capture_state_changed(state); } -void SigSession::set_default_device() -{ - shared_ptr default_device; - const list< shared_ptr > &devices = - _device_manager.devices(); - - if (!devices.empty()) { - // Fall back to the first device in the list. - default_device = devices.front(); - - // Try and find the demo device and select that by default - BOOST_FOREACH (shared_ptr dev, devices) - if (strcmp(dev->dev_inst()->driver->name, - "demo") == 0) { - default_device = dev; - break; - } - } - - set_device(default_device); -} - void SigSession::update_signals(shared_ptr dev_inst) { assert(dev_inst);