diff options
author | Jay Sorg <jay.sorg@gmail.com> | 2013-06-06 11:08:04 -0700 |
---|---|---|
committer | Jay Sorg <jay.sorg@gmail.com> | 2013-06-06 11:08:04 -0700 |
commit | b4ff5e1d88c9e6f7ff162a016f31e59a4928e77d (patch) | |
tree | b4822c167b532713524f07becde50a19991bf1f9 /sesman | |
parent | 5223d1078f5de92bec78bea478f4d542a8a390db (diff) | |
parent | 5098f8b0fe30241507539ca09027a2c799f10686 (diff) | |
download | xrdp-proprietary-b4ff5e1d88c9e6f7ff162a016f31e59a4928e77d.tar.gz xrdp-proprietary-b4ff5e1d88c9e6f7ff162a016f31e59a4928e77d.zip |
Merge remote-tracking branch 'xrdp-org/master'
Diffstat (limited to 'sesman')
-rw-r--r-- | sesman/chansrv/pulse/module-xrdp-sink.c | 5 | ||||
-rw-r--r-- | sesman/chansrv/pulse/pulse-notes.txt | 7 | ||||
-rw-r--r-- | sesman/chansrv/pulse/pulse-notes.ubuntu.txt | 20 |
3 files changed, 29 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 <pulse/rtclock.h> #include <pulse/timeval.h> #include <pulse/xmalloc.h> -//#include <pulse/i18n.h> #include <pulsecore/core-error.h> #include <pulsecore/sink.h> @@ -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); 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 |