Fix #1412 by only showing suitable PDs, not all of them

[pulseview.git] / pv / widgets / decodermenu.cpp

diff --git a/pv/widgets/decodermenu.cpp b/pv/widgets/decodermenu.cpp
index 3ea1c841d6530413b71d5ed9d077a65d66ceb2a9..9fcc0cf077c5e7a00b6a0e7ccadc0cb3e7590383 100644 (file)
--- a/pv/widgets/decodermenu.cpp
+++ b/pv/widgets/decodermenu.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
@@ -27,28 +26,38 @@
 namespace pv {
 namespace widgets {
 
-DecoderMenu::DecoderMenu(QWidget *parent, bool first_level_decoder) :
+DecoderMenu::DecoderMenu(QWidget *parent, const char* input, bool first_level_decoder) :
        QMenu(parent),
        mapper_(this)
 {
-       GSList *l = g_slist_sort(g_slist_copy(
+       GSList *li = g_slist_sort(g_slist_copy(
                (GSList*)srd_decoder_list()), decoder_name_cmp);
-       for (; l; l = l->next)
-       {
+       for (GSList *l = li; l; l = l->next) {
                const srd_decoder *const d = (srd_decoder*)l->data;
                assert(d);
 
                const bool have_channels = (d->channels || d->opt_channels) != 0;
-               if (first_level_decoder == have_channels) {
-                       QAction *const action =
-                               addAction(QString::fromUtf8(d->name));
-                       action->setData(qVariantFromValue(l->data));
-                       mapper_.setMapping(action, action);
-                       connect(action, SIGNAL(triggered()),
-                               &mapper_, SLOT(map()));
+               if (first_level_decoder != have_channels)
+                       continue;
+
+               if (!first_level_decoder) {
+                       // Dismiss all non-stacked decoders unless we're looking for first-level decoders
+                       if (!d->inputs)
+                               continue;
+
+                       // TODO For now we ignore that d->inputs is actually a list
+                       if (strncmp((char*)(d->inputs->data), input, 1024) != 0)
+                               continue;
                }
+
+               QAction *const action =
+                       addAction(QString::fromUtf8(d->name));
+               action->setData(qVariantFromValue(l->data));
+               mapper_.setMapping(action, action);
+               connect(action, SIGNAL(triggered()),
+                       &mapper_, SLOT(map()));
        }
-       g_slist_free(l);
+       g_slist_free(li);
 
        connect(&mapper_, SIGNAL(mapped(QObject*)),
                this, SLOT(on_action(QObject*)));
@@ -67,8 +76,8 @@ void DecoderMenu::on_action(QObject *action)
                (srd_decoder*)((QAction*)action)->data().value<void*>();
        assert(dec);
 
-       decoder_selected(dec);  
+       decoder_selected(dec);
 }
 
-} // widgets
-} // pv
+}  // namespace widgets
+}  // namespace pv