X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=1156d6f5c87b2e79993f6cea7426e8411adc51e4;hb=f27ee56d9c2b18158f2a9451b295123288134611;hp=1dd8c5077301dbebde604aa64fa9463328df5573;hpb=f46e495ef1db0a4e522462ac18260f2151fa2b89;p=pulseview.git diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp index 1dd8c50..1156d6f 100644 --- a/pv/dialogs/connect.cpp +++ b/pv/dialogs/connect.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include #include @@ -34,8 +34,8 @@ extern "C" { #include } -using boost::shared_ptr; using std::list; +using std::shared_ptr; using std::string; extern sr_context *sr_ctx; @@ -119,7 +119,7 @@ void Connect::populate_drivers() hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(int32_t)); for (unsigned int j = 0; j < num_opts; j++) - if (hwopts[j] == SR_CONF_SAMPLERATE) { + if ((hwopts[j] & SR_CONF_MASK) == SR_CONF_SAMPLERATE) { supported_device = true; break; } @@ -174,7 +174,7 @@ void Connect::scan_pressed() g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts); - BOOST_FOREACH(shared_ptr dev_inst, devices) + for (shared_ptr dev_inst : devices) { assert(dev_inst); const sr_dev_inst *const sdi = dev_inst->dev_inst();