X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fwidgets%2Fdecodermenu.cpp;h=5cf99e5212690ee18e18b2fe08195d94db7d7041;hb=HEAD;hp=7da77bd3bb08c922bd47d95e9fad480b07fab30f;hpb=2ad82c2e40b6865481733913a2c32735602f63c4;p=pulseview.git

diff --git a/pv/widgets/decodermenu.cpp b/pv/widgets/decodermenu.cpp
index 7da77bd3..5cf99e52 100644
--- 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,47 +26,58 @@
 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*)srd_decoder_list()), decoder_name_cmp);
-	for (; l; l = l->next) {
+	GSList *li = g_slist_sort(g_slist_copy((GSList*)srd_decoder_list()), decoder_name_cmp);
+
+	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(QVariant::fromValue(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*)));
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	connect(&mapper_, SIGNAL(mappedObject(QObject*)), this, SLOT(on_action(QObject*)));
+#else
+	connect(&mapper_, SIGNAL(mapped(QObject*)), this, SLOT(on_action(QObject*)));
+#endif
 }
 
 int DecoderMenu::decoder_name_cmp(const void *a, const void *b)
 {
-	return strcmp(((const srd_decoder*)a)->name,
-		((const srd_decoder*)b)->name);
+	return strcmp(((const srd_decoder*)a)->name, ((const srd_decoder*)b)->name);
 }
 
 void DecoderMenu::on_action(QObject *action)
 {
 	assert(action);
-	srd_decoder *const dec =
-		(srd_decoder*)((QAction*)action)->data().value<void*>();
+
+	srd_decoder *const dec = (srd_decoder*)((QAction*)action)->data().value<void*>();
 	assert(dec);
 
-	decoder_selected(dec);	
+	decoder_selected(dec);
 }
 
-} // widgets
-} // pv
+}  // namespace widgets
+}  // namespace pv