From c7eb88b6cf32b06eeb1a5aa85b7fc77d70bad2e7 Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Wed, 5 Jun 2013 00:22:15 -0700 Subject: [PATCH 1/3] X11rdp: fix for buildx.sh --- xorg/X11R7.6/buildx.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xorg/X11R7.6/buildx.sh b/xorg/X11R7.6/buildx.sh index 3b2bad78..b778a605 100755 --- a/xorg/X11R7.6/buildx.sh +++ b/xorg/X11R7.6/buildx.sh @@ -2,7 +2,7 @@ # buildx.sh: a script for building X11R7.6 X server for use with xrdp # -# Copyright 2011-2012 Jay Sorg Jay.Sorg@gmail.com +# Copyright 2011-2013 Jay Sorg Jay.Sorg@gmail.com # # Authors # Jay Sorg Jay.Sorg@gmail.com @@ -35,6 +35,8 @@ download_file() echo "downloading file $file" + cd downloads + if [ "$file" = "libpthread-stubs-0.3.tar.bz2" ]; then wget -cq http://xcb.freedesktop.org/dist/$file status=$? @@ -391,6 +393,7 @@ then fi # this will copy the build X server with the other X server binaries +cd rdp strip X11rdp cp X11rdp $X11RDPBASE/bin From 1b8b5daab5a42f182f7b2623dd890740b336a5fb Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Thu, 6 Jun 2013 10:57:17 -0700 Subject: [PATCH 2/3] more pulse notes --- sesman/chansrv/pulse/pulse-notes.txt | 7 +++++++ sesman/chansrv/pulse/pulse-notes.ubuntu.txt | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 sesman/chansrv/pulse/pulse-notes.ubuntu.txt diff --git a/sesman/chansrv/pulse/pulse-notes.txt b/sesman/chansrv/pulse/pulse-notes.txt index b5d51572..92a9878d 100644 --- a/sesman/chansrv/pulse/pulse-notes.txt +++ b/sesman/chansrv/pulse/pulse-notes.txt @@ -70,3 +70,10 @@ load-module module-xrdp-sink load-module module-native-protocol-unix #load-module module-udev-detect tsched=0 --------------------------------- + +To see a list of sinks +pacmd list-sinks + +To manually load a sink +pactl load-module module-xrdp-sink.so sink_name=test + diff --git a/sesman/chansrv/pulse/pulse-notes.ubuntu.txt b/sesman/chansrv/pulse/pulse-notes.ubuntu.txt new file mode 100644 index 00000000..c0e29c40 --- /dev/null +++ b/sesman/chansrv/pulse/pulse-notes.ubuntu.txt @@ -0,0 +1,20 @@ + +this is /etc/apt/sources.list +I added the deb-src line + +---------------------- +deb http://packages.linuxmint.com/ maya main upstream import +deb http://archive.ubuntu.com/ubuntu/ precise main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ precise-updates main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ precise-updates main restricted universe multiverse +deb http://security.ubuntu.com/ubuntu/ precise-security main restricted universe multiverse +deb http://archive.canonical.com/ubuntu/ precise partner +deb http://packages.medibuntu.org/ precise free non-free + +#deb http://archive.getdeb.net/ubuntu precise-getdeb apps +#deb http://archive.getdeb.net/ubuntu precise-getdeb games +deb http://drbl.sourceforge.net/drbl-core drbl stable +---------------------- + +apt-get install dpkg-dev +apt-get build-dep pulseaudio From 5098f8b0fe30241507539ca09027a2c799f10686 Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Thu, 6 Jun 2013 11:05:39 -0700 Subject: [PATCH 3/3] pulse: change some errors to debug --- sesman/chansrv/pulse/module-xrdp-sink.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sesman/chansrv/pulse/module-xrdp-sink.c b/sesman/chansrv/pulse/module-xrdp-sink.c index f6650635..3f09b727 100644 --- a/sesman/chansrv/pulse/module-xrdp-sink.c +++ b/sesman/chansrv/pulse/module-xrdp-sink.c @@ -47,7 +47,6 @@ #include #include #include -//#include #include #include @@ -168,7 +167,7 @@ static void sink_update_requested_latency_cb(pa_sink *s) { u->got_max_latency = 0; if (u->block_usec == (pa_usec_t) -1) { u->block_usec = s->thread_info.max_latency; - pa_log("2 block_usec %d", u->block_usec); + pa_log_debug("2 block_usec %d", u->block_usec); u->got_max_latency = 1; } @@ -503,7 +502,7 @@ int pa__init(pa_module*m) { pa_sink_set_rtpoll(u->sink, u->rtpoll); u->block_usec = BLOCK_USEC; - pa_log("3 block_usec %d", u->block_usec); + pa_log_debug("3 block_usec %d", u->block_usec); nbytes = pa_usec_to_bytes(u->block_usec, &u->sink->sample_spec); pa_sink_set_max_rewind(u->sink, nbytes); pa_sink_set_max_request(u->sink, nbytes);