X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ursaryd.c;h=943348843535ad8a3ebd6acd4c3d06eea7b1c45d;hb=a65f75a3e00718da9d9e41fb0e64302fb984b6f9;hp=ca3f0617de0ccc693188f8970ccc98ad0d00ab49;hpb=78b3a36f046a5d609a20b4772014f9e7958ba1c5;p=ursary.git

diff --git a/ursaryd.c b/ursaryd.c
index ca3f061..9433488 100644
--- a/ursaryd.c
+++ b/ursaryd.c
@@ -1,7 +1,7 @@
 /*
  *	The Ursary Audio Controls
  *
- *	(c) 2014--2018 Martin Mares <mj@ucw.cz>
+ *	(c) 2014--2020 Martin Mares <mj@ucw.cz>
  */
 
 #undef LOCAL_DEBUG
@@ -26,19 +26,21 @@
  *	Map of all controls
  *
  *		rotary		red button	green button
- *	0	sink Brum	mute		-
+ *	0	sink PCH	mute		use headphones
  *	1	-		-		-
  *	2	-		-		-
  *	3	-		-		-
- *	4	MPD		mute		play/pause/stop
- *	5	Albireo MPV	mute		-
- *	6	Albireo other	mute		-
- *	7	other machines	mute		-
+ *	4	MPD		mute		MPD play/pause
+ *	5	Albireo MPV	mute		MPD stop
+ *	6	Albireo other	mute		MPD prev
+ *	7	other machines	mute		MPD next
  *
  *	center	-
  *	slider	-
  */
 
+#define PCH_SINK "alsa_output.pci-0000_00_1f.3.analog-stereo"
+
 /*** Sink controls ***/
 
 static double volume_from_pa(pa_volume_t vol)
@@ -604,8 +606,8 @@ static void do_update(struct main_timer *t)
     }
 
   // Everything normal
-  update_ring_from_sink(0, "alsa_output.brum.analog-stereo");
-  update_button_from_port(8, "alsa_output.brum.analog-stereo", "analog-output-headphones");
+  update_ring_from_sink(0, PCH_SINK);
+  update_button_from_port(8, PCH_SINK, "analog-output-headphones");
   update_groups();
 #if 0
   update_default_sink();
@@ -644,7 +646,7 @@ void notify_rotary(int rotary, int delta)
   switch (rotary)
     {
     case 0:
-      update_sink_from_rotary(delta, "alsa_output.brum.analog-stereo");
+      update_sink_from_rotary(delta, PCH_SINK);
       break;
     default:
       update_group_from_rotary(rotary, delta);
@@ -659,10 +661,10 @@ void notify_button(int button, int on)
   switch (button)
     {
     case 0:
-      update_sink_mute_from_button(on, "alsa_output.brum.analog-stereo");
+      update_sink_mute_from_button(on, PCH_SINK);
       break;
     case 8:
-      update_port_from_button(on, "alsa_output.brum.analog-stereo", "analog-output-lineout", "analog-output-headphones");
+      update_port_from_button(on, PCH_SINK, "analog-output-lineout", "analog-output-headphones");
       break;
 #if 0
     case 9: