Merge tag 'branchpoint-5.1' into release

[disorder] / disobedience / control.c

diff --git a/disobedience/control.c b/disobedience/control.c
index 8e72c2e759d3fd0dc08a3708688e126954f39857..1cdc190b4ea504af212a2b374925b9ee561fcdf6 100644 (file)
--- a/disobedience/control.c
+++ b/disobedience/control.c
@@ -128,6 +128,9 @@ struct icon {
    * Can be NULL for always sensitive.
    */
   int (*sensitive)(void);
    * Can be NULL for always sensitive.
    */
   int (*sensitive)(void);

+
+  /** @brief True if the menu item has inverse sense to the button */
+  gboolean menu_invert;

   
   /** @brief Pointer to button */
   GtkWidget *button;
   
   /** @brief Pointer to button */
   GtkWidget *button;


@@ -184,14 +187,15 @@ static struct icon icons[] = {
     stock: TRUE,
     icon: GTK_STOCK_MEDIA_PAUSE,
     label: "Pause",
     stock: TRUE,
     icon: GTK_STOCK_MEDIA_PAUSE,
     label: "Pause",

-    tip_on: "Pause playing track",
-    tip_off: "Resume playing track",
+    tip_on: "Resume playing track",
+    tip_off: "Pause playing track",

     menuitem: "<GdisorderMain>/Control/Playing",
     on: pause_resume_on,
     sensitive: pause_resume_sensitive,
     action_go_on: disorder_eclient_pause,
     action_go_off: disorder_eclient_resume,
     events: "pause-changed playing-changed rights-changed playing-track-changed",
     menuitem: "<GdisorderMain>/Control/Playing",
     on: pause_resume_on,
     sensitive: pause_resume_sensitive,
     action_go_on: disorder_eclient_pause,
     action_go_off: disorder_eclient_resume,
     events: "pause-changed playing-changed rights-changed playing-track-changed",

+    menu_invert: TRUE,

   },
   {
     stock: TRUE,
   },
   {
     stock: TRUE,


@@ -327,8 +331,8 @@ GtkWidget *control_widget(void) {
   gtk_widget_set_style(balance_widget, tool_style);
   gtk_scale_set_digits(GTK_SCALE(volume_widget), 10);
   gtk_scale_set_digits(GTK_SCALE(balance_widget), 10);
   gtk_widget_set_style(balance_widget, tool_style);
   gtk_scale_set_digits(GTK_SCALE(volume_widget), 10);
   gtk_scale_set_digits(GTK_SCALE(balance_widget), 10);

-  gtk_widget_set_size_request(volume_widget, 192, -1);
-  gtk_widget_set_size_request(balance_widget, 192, -1);
+  gtk_widget_set_size_request(volume_widget, 128, -1);
+  gtk_widget_set_size_request(balance_widget, 128, -1);

   gtk_widget_set_tooltip_text(volume_widget, "Volume");
   gtk_widget_set_tooltip_text(balance_widget, "Balance");
   gtk_box_pack_start(GTK_BOX(hbox), toolbar,
   gtk_widget_set_tooltip_text(volume_widget, "Volume");
   gtk_widget_set_tooltip_text(balance_widget, "Balance");
   gtk_box_pack_start(GTK_BOX(hbox), toolbar,


@@ -418,7 +422,8 @@ static void icon_changed(const char attribute((unused)) *event,
   /* Icons with an associated menu item */
   if(icon->item) {
     if(icon->toggle)
   /* Icons with an associated menu item */
   if(icon->item) {
     if(icon->toggle)

-      gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(icon->item), on);
+      gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(icon->item),
+                                     !!icon->menu_invert ^ !!on);

     gtk_widget_set_sensitive(icon->item, sensitive);
   }
   --suppress_actions;
     gtk_widget_set_sensitive(icon->item, sensitive);
   }
   --suppress_actions;


@@ -458,14 +463,12 @@ static void clicked_menu(GtkMenuItem attribute((unused)) *menuitem,
 
 static void toggled_menu(GtkCheckMenuItem attribute((unused)) *menuitem,
                          gpointer userdata) {
 
 static void toggled_menu(GtkCheckMenuItem attribute((unused)) *menuitem,
                          gpointer userdata) {

-  clicked_icon(NULL, userdata);
+  toggled_icon(NULL, userdata);

 }
 
 /** @brief Called when a volume command completes */
 static void volume_completed(void attribute((unused)) *v,
 }
 
 /** @brief Called when a volume command completes */
 static void volume_completed(void attribute((unused)) *v,

-                             const char *err,
-                             int attribute((unused)) l,
-                             int attribute((unused)) r) {
+                             const char *err) {

   if(err)
     popup_protocol_error(0, err);
   /* We don't set the UI's notion of the volume here, it is set from the log
   if(err)
     popup_protocol_error(0, err);
   /* We don't set the UI's notion of the volume here, it is set from the log


@@ -493,10 +496,10 @@ static void volume_adjusted(GtkAdjustment attribute((unused)) *a,
     if(backend && backend->set_volume)
       backend->set_volume(&l, &r);
   } else
     if(backend && backend->set_volume)
       backend->set_volume(&l, &r);
   } else

-    disorder_eclient_volume(client, volume_completed,
-                            nearbyint(left(v, b) * 100),
-                            nearbyint(right(v, b) * 100),
-                            0);
+    disorder_eclient_set_volume(client, volume_completed,
+                                nearbyint(left(v, b) * 100),
+                                nearbyint(right(v, b) * 100),
+                                0);

 }
 
 /** @brief Formats the volume value */
 }
 
 /** @brief Formats the volume value */