jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'xrdp-org/master'

Browse Source
This commit is contained in:
Jay Sorg 2013-06-06 11:08:04 -07:00
commit b4ff5e1d88
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sesman/chansrv/pulse/module-xrdp-sink.c
View File

@ -47,7 +47,6 @@
#include <pulse/rtclock.h> #include <pulse/rtclock.h>
#include <pulse/timeval.h> #include <pulse/timeval.h>
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
//#include <pulse/i18n.h>
#include <pulsecore/core-error.h> #include <pulsecore/core-error.h>
#include <pulsecore/sink.h> #include <pulsecore/sink.h>
@ -168,7 +167,7 @@ static void sink_update_requested_latency_cb(pa_sink *s) {
u->got_max_latency = 0; u->got_max_latency = 0;
if (u->block_usec == (pa_usec_t) -1) { if (u->block_usec == (pa_usec_t) -1) {
u->block_usec = s->thread_info.max_latency; 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; u->got_max_latency = 1;
} }
@ -503,7 +502,7 @@ int pa__init(pa_module*m) {
pa_sink_set_rtpoll(u->sink, u->rtpoll); pa_sink_set_rtpoll(u->sink, u->rtpoll);
u->block_usec = BLOCK_USEC; 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); nbytes = pa_usec_to_bytes(u->block_usec, &u->sink->sample_spec);
pa_sink_set_max_rewind(u->sink, nbytes); pa_sink_set_max_rewind(u->sink, nbytes);
pa_sink_set_max_request(u->sink, nbytes); pa_sink_set_max_request(u->sink, nbytes);

7
sesman/chansrv/pulse/pulse-notes.txt
View File

@ -70,3 +70,10 @@ load-module module-xrdp-sink
load-module module-native-protocol-unix load-module module-native-protocol-unix
#load-module module-udev-detect tsched=0 #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

20
sesman/chansrv/pulse/pulse-notes.ubuntu.txt Normal file
View File

@ -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

5
xorg/X11R7.6/buildx.sh
View File

@ -2,7 +2,7 @@
# buildx.sh: a script for building X11R7.6 X server for use with xrdp # 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 # Authors
# Jay Sorg Jay.Sorg@gmail.com # Jay Sorg Jay.Sorg@gmail.com
@ -35,6 +35,8 @@ download_file()
echo "downloading file $file" echo "downloading file $file"
cd downloads
if [ "$file" = "libpthread-stubs-0.3.tar.bz2" ]; then if [ "$file" = "libpthread-stubs-0.3.tar.bz2" ]; then
wget -cq http://xcb.freedesktop.org/dist/$file wget -cq http://xcb.freedesktop.org/dist/$file
status=$? status=$?
@ -391,6 +393,7 @@ then
fi fi
# this will copy the build X server with the other X server binaries # this will copy the build X server with the other X server binaries
cd rdp
strip X11rdp strip X11rdp
cp X11rdp $X11RDPBASE/bin cp X11rdp $X11RDPBASE/bin