Restore scratching from popup menu.

diff --git a/disobedience/queue-menu.c b/disobedience/queue-menu.c
index a8cd691dad0b6964c29c6193191f96ba39d1b833..c8a224add8fca4539e4eaff7de02bd4a43d29d02 100644 (file)
--- a/disobedience/queue-menu.c
+++ b/disobedience/queue-menu.c
@@ -72,12 +72,18 @@ void ql_properties_activate(GtkMenuItem attribute((unused)) *menuitem,
 /* Scratch */
 
 int ql_scratch_sensitive(struct queuelike attribute((unused)) *ql) {
 /* Scratch */
 
 int ql_scratch_sensitive(struct queuelike attribute((unused)) *ql) {

-  return !!playing_track;
+  return !!(last_state & DISORDER_PLAYING)
+    && right_scratchable(last_rights, config->username, playing_track);
+}
+
+static void scratch_completed(void attribute((unused)) *v, const char *error) {
+  if(error)
+    popup_protocol_error(0, error);

 }
 
 void ql_scratch_activate(GtkMenuItem attribute((unused)) *menuitem,
                          gpointer attribute((unused)) user_data) {
 }
 
 void ql_scratch_activate(GtkMenuItem attribute((unused)) *menuitem,
                          gpointer attribute((unused)) user_data) {

-  /* TODO */
+  disorder_eclient_scratch_playing(client, scratch_completed, 0);

 }
 
 /* Remove */
 }
 
 /* Remove */

diff --git a/disobedience/queue.c b/disobedience/queue.c
index 9c0dcc4844aa5544f80f05d262254339b7e24f8a..3a481a20d9acf7832ef418795e79a9555b0901af 100644 (file)
--- a/disobedience/queue.c
+++ b/disobedience/queue.c
@@ -137,7 +137,7 @@ static struct queue_menuitem queue_menuitems[] = {
   { "Track properties", ql_properties_activate, ql_properties_sensitive, 0, 0 },
   { "Select all tracks", ql_selectall_activate, ql_selectall_sensitive, 0, 0 },
   { "Deselect all tracks", ql_selectnone_activate, ql_selectnone_sensitive, 0, 0 },
   { "Track properties", ql_properties_activate, ql_properties_sensitive, 0, 0 },
   { "Select all tracks", ql_selectall_activate, ql_selectall_sensitive, 0, 0 },
   { "Deselect all tracks", ql_selectnone_activate, ql_selectnone_sensitive, 0, 0 },

-  { "Scratch track", ql_scratch_activate, ql_scratch_sensitive, 0, 0 },
+  { "Scratch playing track", ql_scratch_activate, ql_scratch_sensitive, 0, 0 },

   { "Remove track from queue", ql_remove_activate, ql_remove_sensitive, 0, 0 },
 };
 
   { "Remove track from queue", ql_remove_activate, ql_remove_sensitive, 0, 0 },
 };