[qt]hotkey: Add options for previous/next album. Closes: #1737

Author: radioactiveman

src/hotkey/gui.cc

@@ -84,7 +84,9 @@ static const char * event_desc[] = {N_("Previous track"),
                                     N_("Toggle repeat"),
                                     N_("Toggle shuffle"),
                                     N_("Toggle stop after current"),
-                                    N_("Raise player window(s)")};
+                                    N_("Raise player window(s)"),
+                                    N_("Previous album"),
+                                    N_("Next album")};
 
 static_assert(aud::n_elems(event_desc) == EVENT_MAX,
               "event_desc table is not up to date");
@@ -141,8 +143,7 @@ static void set_keytext(GtkWidget * entry, int key, int mask, int type)
 
     gtk_entry_set_text(GTK_ENTRY(entry), text);
     gtk_editable_set_position(GTK_EDITABLE(entry), -1);
-    if (text)
-        g_free(text);
+    g_free(text);
 }
 
 static gboolean on_entry_key_press_event(GtkWidget * widget,

src/hotkey/plugin.cc

@@ -195,13 +195,27 @@ bool handle_keyevent(EVENT event)
         return true;
     }
 
+    /* prev album */
+    if (event == EVENT_PREV_ALBUM)
+    {
+        aud_drct_pl_prev_album();
+        return true;
+    }
+
     /* next track */
     if (event == EVENT_NEXT_TRACK)
     {
         aud_drct_pl_next();
         return true;
     }
 
+    /* next album */
+    if (event == EVENT_NEXT_ALBUM)
+    {
+        aud_drct_pl_next_album();
+        return true;
+    }
+
     /* forward */
     if (event == EVENT_FORWARD)
     {
@@ -334,6 +348,7 @@ void load_config()
     if (max == 0)
         load_defaults();
     else
+    {
         for (i = 0; i < max; i++)
         {
             char * text = nullptr;
@@ -364,6 +379,7 @@ void load_config()
             hotkey->event = (EVENT)aud_get_int("globalHotkey", text);
             g_free(text);
         }
+    }
 }
 
 /* save plugin configuration */

src/hotkey/plugin.h

@@ -4,6 +4,10 @@
 #define TYPE_KEY 0
 #define TYPE_MOUSE 1
 
+/*
+ * Add new events always at the end of the enum (but before EVENT_MAX).
+ * The int values are used in the configuration and hence should not change.
+ */
 typedef enum
 {
     EVENT_PREV_TRACK = 0,
@@ -27,6 +31,9 @@ typedef enum
 
     EVENT_RAISE,
 
+    EVENT_PREV_ALBUM,
+    EVENT_NEXT_ALBUM,
+
     EVENT_MAX
 } EVENT;
 

src/qthotkey/gui.cc

@@ -80,6 +80,8 @@ static const QMap<Event, const char *> event_desc = {
     {Event::ToggleShuffle, N_("Toggle shuffle")},
     {Event::ToggleStop, N_("Toggle stop after current")},
     {Event::Raise, N_("Raise player window(s)")},
+    {Event::PrevAlbum, N_("Previous album")},
+    {Event::NextAlbum, N_("Next album")},
 };
 
 class LineKeyEdit : public QLineEdit

src/qthotkey/plugin.cc

@@ -211,6 +211,14 @@ bool handle_keyevent(Event event)
     }
     break;
 
+    /* prev album */
+    case Event::PrevAlbum:
+    {
+        aud_drct_pl_prev_album();
+        return true;
+    }
+    break;
+
     /* next track */
     case Event::NextTrack:
     {
@@ -219,6 +227,14 @@ bool handle_keyevent(Event event)
     }
     break;
 
+    /* next album */
+    case Event::NextAlbum:
+    {
+        aud_drct_pl_next_album();
+        return true;
+    }
+    break;
+
     /* forward */
     case Event::Forward:
     {

src/qthotkey/plugin.h

@@ -7,8 +7,9 @@ namespace GlobalHotkeys
 {
 
 /*
- * Values in this enum must not be skipped and must start with 0,
- * otherwise event_desc in gui.cc and it's use must be updated.
+ * Values in this enum must not be changed and must start with 0.
+ * New events must always be added at the end (but before Event::Max).
+ * The int values are used in the configuration and shared with the GTK plugin.
  * All values except for Event::Max must be present in event_desc map.
  */
 enum class Event
@@ -34,6 +35,9 @@ enum class Event
 
     Raise,
 
+    PrevAlbum,
+    NextAlbum,
+
     Max
 };