Moved decoder config into the popup

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 183e841e804c3c6f48d37949268ec3227a0c70be..e1f831408a54385d7b12da34999e92a6f6956e2d 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -39,7 +39,6 @@
 #include "devicemanager.h"
 #include "dialogs/about.h"
 #include "dialogs/connect.h"
-#include "dialogs/decoder.h"
 #include "toolbars/samplingbar.h"
 #include "view/logicsignal.h"
 #include "view/view.h"
@@ -376,27 +375,7 @@ void MainWindow::add_decoder(QObject *action)
                (srd_decoder*)((QAction*)action)->data().value<void*>();
        assert(dec);
 
-       vector< shared_ptr<view::LogicSignal> > logic_sigs;
-       const vector< shared_ptr<view::Signal> > &sigs =
-               _session.get_signals();
-       BOOST_FOREACH(shared_ptr<view::Signal> s, sigs) {
-               assert(s);
-               shared_ptr<view::LogicSignal> l =
-                       dynamic_pointer_cast<view::LogicSignal>(s);
-               if (l)
-                       logic_sigs.push_back(l);
-       }
-
-       GHashTable *const options = g_hash_table_new_full(g_str_hash,
-               g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
-
-       dialogs::Decoder dlg(this, dec, logic_sigs, options);
-       if(dlg.exec() != QDialog::Accepted) {
-               g_hash_table_destroy(options);
-               return;
-       }
-
-       _session.add_decoder(dec, dlg.get_probes(), options);
+       _session.add_decoder(dec);
 }
 
 void MainWindow::run_stop()