Merge branch 'master' into devel

4 files changed, 7 insertions, 13 deletions

diff --git a/plugins/dca/dcaplug.c b/plugins/dca/dcaplug.c
index 9d0181f5..9d7f251f 100644
--- a/plugins/dca/dcaplug.c
+++ b/plugins/dca/dcaplug.c
@@ -649,7 +649,7 @@ static DB_decoder_t plugin = {
     .plugin.type = DB_PLUGIN_DECODER,
     .plugin.id = "dts",
     .plugin.name = "dts decoder",
-    .plugin.descr = "dts decoder using libmppdec",
+    .plugin.descr = "dts decoder using libdca from VLC project",
     .plugin.author = "Alexey Yakovenko",
     .plugin.email = "waker@users.sourceforge.net",
     .plugin.website = "http://deadbeef.sf.net",
diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c
index 0280c773..58a3da41 100644
--- a/plugins/gtkui/callbacks.c
+++ b/plugins/gtkui/callbacks.c
@@ -311,12 +311,12 @@ on_mainwin_key_press_event             (GtkWidget       *widget,
                                         GdkEventKey     *event,
                                         gpointer         user_data)
 {
-
+    uint32_t maskedstate = (event->state &~ (GDK_LOCK_MASK | GDK_MOD2_MASK | GDK_MOD3_MASK | GDK_MOD5_MASK)) & 0xfff;
     if (event->keyval == GDK_n && !event->state) {
         // button for that one is not in toolbar anymore, so handle it manually
         deadbeef->sendmessage (M_PLAYRANDOM, 0, 0, 0);
     }
-    else if ((event->state == GDK_MOD1_MASK || event->state == 0) && event->keyval >= GDK_1 && event->keyval <= GDK_9) {
+    else if ((maskedstate == GDK_MOD1_MASK || maskedstate == 0) && event->keyval >= GDK_1 && event->keyval <= GDK_9) {
         int pl = event->keyval - GDK_1;
         if (pl >= 0 && pl < deadbeef->plt_get_count ()) {
             deadbeef->plt_set_curr (pl);
diff --git a/plugins/gtkui/trkproperties.c b/plugins/gtkui/trkproperties.c
index d3c897fc..f60a7b0b 100644
--- a/plugins/gtkui/trkproperties.c
+++ b/plugins/gtkui/trkproperties.c
@@ -156,7 +156,7 @@ trkproperties_fill_metadata (void) {
         if (!value) {
             value = "";
         }
-        gtk_list_store_set (store, &iter, 0, _(types[i+1]), 1, value, -1);
+        gtk_list_store_set (store, &iter, 0, _(types[i+1]), 1, value, 2, types[i], -1);
         i += 2;
     }
     deadbeef->pl_unlock ();
@@ -238,7 +238,7 @@ show_track_properties_dlg (DB_playItem_t *it) {
 
         // metadata tree
         tree = GTK_TREE_VIEW (lookup_widget (trackproperties, "metalist"));
-        store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+        store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
         gtk_tree_view_set_model (tree, GTK_TREE_MODEL (store));
         GtkCellRenderer *rend_text = gtk_cell_renderer_text_new ();
         rend_text2 = GTK_CELL_RENDERER (ddb_cell_renderer_text_multiline_new ());//gtk_cell_renderer_text_new ();
@@ -300,15 +300,14 @@ show_track_properties_dlg (DB_playItem_t *it) {
 static gboolean
 set_metadata_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) {
     GValue key = {0,}, value = {0,};
-    gtk_tree_model_get_value (model, iter, 0, &key);
+    gtk_tree_model_get_value (model, iter, 2, &key);
     gtk_tree_model_get_value (model, iter, 1, &value);
     const char *skey = g_value_get_string (&key);
     const char *svalue = g_value_get_string (&value);
 
 
     for (int i = 0; types[i]; i += 2) {
-        if (!strcmp (skey, types[i+1])) {
-            trace ("setting %s = %s\n", types[i], svalue);
+        if (!strcmp (skey, types[i])) {
             deadbeef->pl_replace_meta (DB_PLAYITEM (data), types[i], svalue);
         }
     }
diff --git a/plugins/supereq/supereq.c b/plugins/supereq/supereq.c
index b72c6c09..af4000fd 100644
--- a/plugins/supereq/supereq.c
+++ b/plugins/supereq/supereq.c
@@ -209,10 +209,6 @@ supereq_enabled (void) {
     return enabled;
 }
 
-static const char settings_dlg[] =
-    "property \"Enable\" checkbox supereq.enable 0;\n"
-;
-
 static DB_supereq_dsp_t plugin = {
     .dsp.plugin.api_vmajor = DB_API_VERSION_MAJOR,
     .dsp.plugin.api_vminor = DB_API_VERSION_MINOR,
@@ -225,7 +221,6 @@ static DB_supereq_dsp_t plugin = {
     .dsp.plugin.website = "http://deadbeef.sf.net",
     .dsp.plugin.start = supereq_plugin_start,
     .dsp.plugin.stop = supereq_plugin_stop,
-    .dsp.plugin.configdialog = settings_dlg,
     .dsp.process_int16 = supereq_process_int16,
     .dsp.reset = supereq_reset,
     .dsp.enable = supereq_enable,