Reconfigured for new burrow ... still lots of tmp hacks there

diff --git a/ursaryd.c b/ursaryd.c
index d5b498f2afe3dfa7db2d11c89bd26bfec1bd7df7..421c701ff5dda005613dcbd6f6bf1abc266a8c0f 100644 (file)
--- a/ursaryd.c
+++ b/ursaryd.c
@@ -26,16 +26,16 @@
  *     Map of all controls
  *
  *             rotary          red button      green button
- *     0       sink Ursarium   mute            select as default (or assign to client selected by touch)
- *     1       sink Catarium   mute            dtto
- *     2       sink Compress   -               dtto
+ *     0       sink Brum       mute            -
+ *     1       -               -               -
+ *     2       -               -               -
  *     3       -               -               -
  *     4       MPD             mute            play/pause/stop
- *     5       Albireo         mute            -
- *     6       Ogion           mute            -
- *     7       Ursula/Havrana  mute            -
+ *     5       Albireo MPV     mute            -
+ *     6       Albireo other   mute            -
+ *     7       other machines  mute            -
  *
- *     center  all sinks
+ *     center  -
  *     slider  -
  */
 
@@ -113,10 +113,9 @@ struct client_map {
 
 static struct client_map client_map[] = {
   { 4, "Music Player Daemon",  "albireo",      },
-  { 5, NULL,                   "albireo",      },
-  { 6, NULL,                   "ogion",        },
-  { 7, NULL,                   "ursula",       },
-  { 7, NULL,                   "havrana",      },
+  { 5, "mpv",                  "albireo",      },
+  { 6, NULL,                   "albireo",      },
+  { 7, NULL,                   NULL,           },
 };
 
 #define CLIENT_MAP_SIZE ARRAY_SIZE(client_map)
@@ -568,10 +567,11 @@ static void do_update(struct main_timer *t)
     }
 
   // Everything normal
-  update_ring_from_sink(0, "ursarium");
-  update_ring_from_sink(1, "catarium");
+  update_ring_from_sink(0, "alsa_output.brum.analog-stereo");
   update_groups();
+#if 0
   update_default_sink();
+#endif
   update_mpd();
 }
 
@@ -606,14 +606,7 @@ void notify_rotary(int rotary, int delta)
   switch (rotary)
     {
     case 0:
-      update_sink_from_rotary(delta, "ursarium");
-      break;
-    case 1:
-      update_sink_from_rotary(delta, "catarium");
-      break;
-    case 8:
-      update_sink_from_rotary(delta, "ursarium");
-      update_sink_from_rotary(delta, "catarium");
+      update_sink_from_rotary(delta, "alsa_output.brum.analog-stereo");
       break;
     default:
       update_group_from_rotary(rotary, delta);
@@ -628,16 +621,15 @@ void notify_button(int button, int on)
   switch (button)
     {
     case 0:
-      update_sink_mute_from_button(on, "ursarium");
-      break;
-    case 1:
-      update_sink_mute_from_button(on, "catarium");
+      update_sink_mute_from_button(on, "alsa_output.brum.analog-stereo");
       break;
+#if 0
     case 8:
     case 9:
     case 10:
       update_default_sink_from_button(button, on);
       break;
+#endif
     case 12:
       update_mpd_from_button(button, on);
       break;