gtkui/qtui/skins: Allow sorting playlist entries by bitrate. Closes: #1356

Author: radioactiveman

src/gtkui/menus.cc

@@ -135,6 +135,7 @@ static const AudguiMenuItem sort_items[] = {
     MenuCommand (N_("By _Custom Title"), nullptr, NONE, sort_custom_title),
     MenuCommand (N_("By C_omment"), nullptr, NONE, sort_comment),
     MenuCommand (N_("By D_isc Number"), nullptr, NONE, sort_disc),
+    MenuCommand (N_("By Bitrate"), nullptr, NONE, sort_bitrate),
     MenuCommand (N_("By File Created"), nullptr, NONE, sort_file_created),
     MenuCommand (N_("By File Modified"), nullptr, NONE, sort_file_modified),
     MenuSep (),
@@ -155,6 +156,7 @@ static const AudguiMenuItem sort_sel_items[] = {
     MenuCommand (N_("By _Custom Title"), nullptr, NONE, sort_sel_custom_title),
     MenuCommand (N_("By C_omment"), nullptr, NONE, sort_sel_comment),
     MenuCommand (N_("By D_isc Number"), nullptr, NONE, sort_sel_disc),
+    MenuCommand (N_("By Bitrate"), nullptr, NONE, sort_sel_bitrate),
     MenuCommand (N_("By File Created"), nullptr, NONE, sort_sel_file_created),
     MenuCommand (N_("By File Modified"), nullptr, NONE, sort_sel_file_modified),
     MenuSep (),

src/gtkui/ui_playlist_widget.cc

@@ -117,7 +117,7 @@ static const Playlist::SortType pw_col_sort_types[PW_COLS] = {
     Playlist::Path,            // path
     Playlist::Filename,        // file name
     Playlist::FormattedTitle,  // custom title
-    Playlist::n_sort_types,    // bitrate
+    Playlist::Bitrate,         // bitrate
     Playlist::Comment,         // comment
     Playlist::Publisher,       // publisher
     Playlist::CatalogNum,      // catalog number

src/qtui/menus.cc

@@ -205,6 +205,7 @@ QMenuBar * qtui_build_menubar(QWidget * parent)
         audqt::MenuCommand({N_("By _Custom Title")}, sort_custom_title),
         audqt::MenuCommand({N_("By C_omment")}, sort_comment),
         audqt::MenuCommand({N_("By D_isc Number")}, sort_disc),
+        audqt::MenuCommand({N_("By Bitrate")}, sort_bitrate),
         audqt::MenuCommand({N_("By File Created")}, sort_file_created),
         audqt::MenuCommand({N_("By File Modified")}, sort_file_modified),
         audqt::MenuSep(),
@@ -225,6 +226,7 @@ QMenuBar * qtui_build_menubar(QWidget * parent)
         audqt::MenuCommand({N_("By _Custom Title")}, sort_sel_custom_title),
         audqt::MenuCommand({N_("By C_omment")}, sort_sel_comment),
         audqt::MenuCommand({N_("By D_isc Number")}, sort_sel_disc),
+        audqt::MenuCommand({N_("By Bitrate")}, sort_sel_bitrate),
         audqt::MenuCommand({N_("By File Created")}, sort_sel_file_created),
         audqt::MenuCommand({N_("By File Modified")}, sort_sel_file_modified),
         audqt::MenuSep(),

src/qtui/playlist_header.cc

@@ -77,7 +77,7 @@ static const Playlist::SortType s_sort_types[] = {
     Playlist::Path,           // path
     Playlist::Filename,       // file name
     Playlist::FormattedTitle, // custom title
-    Playlist::n_sort_types,   // bitrate
+    Playlist::Bitrate,        // bitrate
     Playlist::Comment,        // comment,
     Playlist::Publisher,      // publisher
     Playlist::CatalogNum,     // catalog number

src/skins-qt/menus.cc

@@ -208,6 +208,7 @@ static const audqt::MenuItem sort_items[] = {
     audqt::MenuCommand ({N_("By Custom Title")}, sort_custom_title),
     audqt::MenuCommand ({N_("By Comment")}, sort_comment),
     audqt::MenuCommand ({N_("By Disc Number")}, sort_disc),
+    audqt::MenuCommand ({N_("By Bitrate")}, sort_bitrate),
     audqt::MenuCommand ({N_("By File Created")}, sort_file_created),
     audqt::MenuCommand ({N_("By File Modified")}, sort_file_modified)
 };
@@ -226,6 +227,7 @@ static const audqt::MenuItem sort_selected_items[] = {
     audqt::MenuCommand ({N_("By Custom Title")}, sort_sel_custom_title),
     audqt::MenuCommand ({N_("By Comment")}, sort_sel_comment),
     audqt::MenuCommand ({N_("By Disc Number")}, sort_sel_disc),
+    audqt::MenuCommand ({N_("By Bitrate")}, sort_sel_bitrate),
     audqt::MenuCommand ({N_("By File Created")}, sort_sel_file_created),
     audqt::MenuCommand ({N_("By File Modified")}, sort_sel_file_modified)
 };

src/skins/menus.cc

@@ -212,6 +212,7 @@ static const AudguiMenuItem sort_items[] = {
     MenuCommand (N_("By Custom Title"), nullptr, NO_KEY, sort_custom_title),
     MenuCommand (N_("By Comment"), nullptr, NO_KEY, sort_comment),
     MenuCommand (N_("By Disc Number"), nullptr, NO_KEY, sort_disc),
+    MenuCommand (N_("By Bitrate"), nullptr, NO_KEY, sort_bitrate),
     MenuCommand (N_("By File Created"), nullptr, NO_KEY, sort_file_created),
     MenuCommand (N_("By File Modified"), nullptr, NO_KEY, sort_file_modified)
 };
@@ -230,6 +231,7 @@ static const AudguiMenuItem sort_selected_items[] = {
     MenuCommand (N_("By Custom Title"), nullptr, NO_KEY, sort_sel_custom_title),
     MenuCommand (N_("By Comment"), nullptr, NO_KEY, sort_comment),
     MenuCommand (N_("By Disc Number"), nullptr, NO_KEY, sort_sel_disc),
+    MenuCommand (N_("By Bitrate"), nullptr, NO_KEY, sort_sel_bitrate),
     MenuCommand (N_("By File Created"), nullptr, NO_KEY, sort_sel_file_created),
     MenuCommand (N_("By File Modified"), nullptr, NO_KEY, sort_sel_file_modified)
 };

src/ui-common/menu-ops.cc

@@ -40,6 +40,7 @@ void sort_filename () { ACTIVE.sort_entries (Playlist::Filename); }
 void sort_custom_title () { ACTIVE.sort_entries (Playlist::FormattedTitle); }
 void sort_comment () { ACTIVE.sort_entries (Playlist::Comment); }
 void sort_disc () { ACTIVE.sort_entries (Playlist::Disc); }
+void sort_bitrate () { ACTIVE.sort_entries (Playlist::Bitrate); }
 void sort_file_created () { ACTIVE.sort_entries (Playlist::FileCreated); }
 void sort_file_modified () { ACTIVE.sort_entries (Playlist::FileModified); }
 void sort_reverse () { ACTIVE.reverse_order (); }
@@ -58,6 +59,7 @@ void sort_sel_filename () { ACTIVE.sort_selected (Playlist::Filename); }
 void sort_sel_custom_title () { ACTIVE.sort_selected (Playlist::FormattedTitle); }
 void sort_sel_comment () { ACTIVE.sort_selected (Playlist::Comment); }
 void sort_sel_disc () { ACTIVE.sort_selected (Playlist::Disc); }
+void sort_sel_bitrate () { ACTIVE.sort_selected (Playlist::Bitrate); }
 void sort_sel_file_created () { ACTIVE.sort_selected (Playlist::FileCreated); }
 void sort_sel_file_modified () { ACTIVE.sort_selected (Playlist::FileModified); }
 void sort_sel_reverse () { ACTIVE.reverse_selected (); }

src/ui-common/menu-ops.h

@@ -39,6 +39,7 @@ void sort_filename ();
 void sort_custom_title ();
 void sort_comment ();
 void sort_disc ();
+void sort_bitrate ();
 void sort_file_created ();
 void sort_file_modified ();
 void sort_reverse ();
@@ -58,6 +59,7 @@ void sort_sel_filename ();
 void sort_sel_custom_title ();
 void sort_sel_comment ();
 void sort_sel_disc ();
+void sort_sel_bitrate ();
 void sort_sel_file_created ();
 void sort_sel_file_modified ();
 void sort_sel_reverse ();