From 28b58a660b887d533224258f61c290cb0e33c4e8 Mon Sep 17 00:00:00 2001
From: Laxmikant Rashinkar <LK.Rashinkar@gmail.com>
Date: Sun, 12 Jan 2014 12:09:15 -0800
Subject: [PATCH] we now load module-xrdp-sink/source automatically so user's
 dont have to mess around with configuring /etc/pulse/default.pa config file

---
 module-xrdp-sink.c     |  2 +-
 module-xrdp-source.c   |  2 +-
 pulse-notes.ubuntu.txt | 29 +++++++++--------------------
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/module-xrdp-sink.c b/module-xrdp-sink.c
index eb7211a..d56a488 100644
--- a/module-xrdp-sink.c
+++ b/module-xrdp-sink.c
@@ -72,7 +72,7 @@ PA_MODULE_USAGE(
         "channels=<number of channels> "
         "channel_map=<channel map>");
 
-#define DEFAULT_SINK_NAME "xrdp"
+#define DEFAULT_SINK_NAME "xrdp-sink"
 #define BLOCK_USEC 30000
 //#define BLOCK_USEC (PA_USEC_PER_SEC * 2)
 #define CHANSRV_PORT_STR "/tmp/.xrdp/xrdp_chansrv_audio_out_socket_%d"
diff --git a/module-xrdp-source.c b/module-xrdp-source.c
index 2d85ad4..2d7ec4f 100644
--- a/module-xrdp-source.c
+++ b/module-xrdp-source.c
@@ -60,7 +60,7 @@ PA_MODULE_USAGE(
         "description=<description for the source> "
         "latency_time=<latency time in ms>");
 
-#define DEFAULT_SOURCE_NAME "xrdp"
+#define DEFAULT_SOURCE_NAME "xrdp-source"
 #define DEFAULT_LATENCY_TIME 10
 #define MAX_LATENCY_USEC (PA_USEC_PER_SEC * 2)
 #define CHANSRV_PORT_STR "/tmp/.xrdp/xrdp_chansrv_audio_in_socket_%d"
diff --git a/pulse-notes.ubuntu.txt b/pulse-notes.ubuntu.txt
index 51fc506..053a002 100644
--- a/pulse-notes.ubuntu.txt
+++ b/pulse-notes.ubuntu.txt
@@ -1,4 +1,8 @@
 
+--------------------------------------
+ Building pulseaudio modules for xrdp
+--------------------------------------
+
 o append the following line to /etc/apt/sources.list
 
     deb-src http://archive.ubuntu.com/ubuntu/ precise-updates main restricted universe multiverse
@@ -45,31 +49,16 @@ o sudo cp module-xrdp-sink.so   /usr/lib/pulse-<version>/modules
   sudo cp module-xrdp-source.so /usr/lib/pulse-<version>/modules
   note: on a 64bit machine use lib64 instead of lib
 
-o cd /etc/pulse
-
-o sudo mv default.pa default.pa.orig
+--------------------------------------
+ To test sound/microphone redirection
+--------------------------------------
 
-o sudo vi default.pa and add the following lines to it
+o install gnome sound recorder or your favorite sound recorder
 
-.nofail
-.fail
-load-module module-augment-properties
-#load-module module-alsa-sink device=hw:0
-#load-module module-alsa-source device=hw:0
-#load-module module-pipe-sink
-#load-module module-pipe-source
-#load-module module-null-sink
-load-module module-xrdp-sink
-load-module module-xrdp-source
-load-module module-native-protocol-unix
-#load-module module-udev-detect tsched=0
+o mplayer -ao pulse <audio file>
 
 o sudo apt-get install pavucontrol
 
-o pulseaudio --kill
-
-o mplayer -ao pulse <audio file>
-
 o in another window run pavucontrol and you should see xrdp-sink in use
 
 o to enable pulseaudio log