Browse Source

chansrv: work on pulse sink

pull/1/head
Jay Sorg 11 years ago
parent
commit
13afc0f594
2 changed files with 33 additions and 10 deletions
  1. +4
    -10
      module-xrdp-sink.c
  2. +29
    -0
      pulse-notes.txt

+ 4
- 10
module-xrdp-sink.c View File

@ -262,7 +262,6 @@ static int data_send(struct userdata *u, pa_memchunk *chunk) {
char *data; char *data;
int bytes; int bytes;
int sent; int sent;
int display_num;
int fd; int fd;
struct header h; struct header h;
struct sockaddr_un s; struct sockaddr_un s;
@ -276,9 +275,8 @@ static int data_send(struct userdata *u, pa_memchunk *chunk) {
fd = socket(PF_LOCAL, SOCK_STREAM, 0); fd = socket(PF_LOCAL, SOCK_STREAM, 0);
memset(&s, 0, sizeof(s)); memset(&s, 0, sizeof(s));
s.sun_family = AF_UNIX; s.sun_family = AF_UNIX;
display_num = get_display_num_from_display(getenv("DISPLAY"));
bytes = sizeof(s.sun_path) - 1; bytes = sizeof(s.sun_path) - 1;
snprintf(s.sun_path, bytes, CHANSRV_PORT_STR, display_num);
snprintf(s.sun_path, bytes, CHANSRV_PORT_STR, u->display_num);
pa_log("trying to conenct to %s", s.sun_path); pa_log("trying to conenct to %s", s.sun_path);
if (connect(fd, (struct sockaddr *)&s, if (connect(fd, (struct sockaddr *)&s,
sizeof(struct sockaddr_un)) != 0) { sizeof(struct sockaddr_un)) != 0) {
@ -296,15 +294,11 @@ static int data_send(struct userdata *u, pa_memchunk *chunk) {
//pa_log("bytes %d", bytes); //pa_log("bytes %d", bytes);
/* from rewind */ /* from rewind */
if (u->skip_bytes > 0)
{
if (bytes > u->skip_bytes)
{
if (u->skip_bytes > 0) {
if (bytes > u->skip_bytes) {
bytes -= u->skip_bytes; bytes -= u->skip_bytes;
u->skip_bytes = 0; u->skip_bytes = 0;
}
else
{
} else {
u->skip_bytes -= bytes; u->skip_bytes -= bytes;
return bytes; return bytes;
} }


+ 29
- 0
pulse-notes.txt View File

@ -25,3 +25,32 @@ autospawn = no
daemon-binary = /bin/true daemon-binary = /bin/true
xfreerdp -a 24 -z --plugin rdpsnd --data alsa:hw:0,0 -- 127.0.0.1 xfreerdp -a 24 -z --plugin rdpsnd --data alsa:hw:0,0 -- 127.0.0.1
to get ./configure on pulse source to run
apt-get install libsndfile1-dev
apt-get install libspeex-dev
apt-get install libspeexdsp-dev
alsamixer
apt-get install alsa-utils
/etc/asound.conf
---------------------------------
pcm.pulse {
type pulse
}
ctl.pulse {
type pulse
}
pcm.!default {
type pulse
}
ctl.!default {
type pulse
}
---------------------------------

Loading…
Cancel
Save