mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'channels' of github.com:FreeRDP/FreeRDP

This commit is contained in:
Marc-André Moreau 2012-10-09 14:00:51 -04:00
parent ce13f39de2 4b1b51b1f8
commit f8013ff6ac
6 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
channels/audin/client/pulse/audin_pulse.c
View File

@ -387,10 +387,10 @@ static void audin_pulse_open(IAudinDevice* device, AudinReceive receive, void* u
audin_pulse_stream_state_callback, pulse);
pa_stream_set_read_callback(pulse->stream,
audin_pulse_stream_request_callback, pulse);
buffer_attr.maxlength = (UINT32_t) -1;
buffer_attr.tlength = (UINT32_t) -1;
buffer_attr.prebuf = (UINT32_t) -1;
buffer_attr.minreq = (UINT32_t) -1;
buffer_attr.maxlength = (UINT32) -1;
buffer_attr.tlength = (UINT32) -1;
buffer_attr.prebuf = (UINT32) -1;
buffer_attr.minreq = (UINT32) -1;
/* 500ms latency */
buffer_attr.fragsize = pa_usec_to_bytes(500000, &pulse->sample_spec);
if (pa_stream_connect_record(pulse->stream,

6
channels/rdpsnd/client/pulse/rdpsnd_pulse.c
View File

@ -288,9 +288,9 @@ static void rdpsnd_pulse_open(rdpsndDevicePlugin* device, rdpsndFormat* format,
{
buffer_attr.maxlength = pa_usec_to_bytes(pulse->latency * 2 * 1000, &pulse->sample_spec);
buffer_attr.tlength = pa_usec_to_bytes(pulse->latency * 1000, &pulse->sample_spec);
buffer_attr.prebuf = (UINT32_t) -1;
buffer_attr.minreq = (UINT32_t) -1;
buffer_attr.fragsize = (UINT32_t) -1;
buffer_attr.prebuf = (UINT32) -1;
buffer_attr.minreq = (UINT32) -1;
buffer_attr.fragsize = (UINT32) -1;
flags |= PA_STREAM_ADJUST_LATENCY;
}

6
channels/tsmf/client/pulse/tsmf_pulse.c
View File

@ -243,9 +243,9 @@ static BOOL tsmf_pulse_open_stream(TSMFPulseAudioDevice* pulse)
tsmf_pulse_stream_request_callback, pulse);
buffer_attr.maxlength = pa_usec_to_bytes(500000, &pulse->sample_spec);
buffer_attr.tlength = pa_usec_to_bytes(250000, &pulse->sample_spec);
buffer_attr.prebuf = (UINT32_t) -1;
buffer_attr.minreq = (UINT32_t) -1;
buffer_attr.fragsize = (UINT32_t) -1;
buffer_attr.prebuf = (UINT32) -1;
buffer_attr.minreq = (UINT32) -1;
buffer_attr.fragsize = (UINT32) -1;
if (pa_stream_connect_playback(pulse->stream,
pulse->device[0] ? pulse->device : NULL, &buffer_attr,
PA_STREAM_ADJUST_LATENCY | PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE,

2
channels/urbdrc/libusb/libusb_udevice.c
View File

@ -334,7 +334,7 @@ func_iso_data_init(ISO_USER_DATA * iso_user_data, UINT32 numPacket, UINT32 buffs
static int
func_config_release_all_interface(LIBUSB_DEVICE_HANDLE *libusb_handle, UINT32_t NumInterfaces)
func_config_release_all_interface(LIBUSB_DEVICE_HANDLE *libusb_handle, UINT32 NumInterfaces)
{
int i, ret;
for (i = 0; i < NumInterfaces; i++)

17
channels/urbdrc/libusb/libusb_udevice.h
View File

@ -29,18 +29,16 @@
#include "request_queue.h"
#include "urbdrc_main.h"
typedef struct libusb_device LIBUSB_DEVICE;
typedef struct libusb_device_handle LIBUSB_DEVICE_HANDLE;
typedef struct libusb_device_descriptor LIBUSB_DEVICE_DESCRIPTOR;
typedef struct libusb_config_descriptor LIBUSB_CONFIG_DESCRIPTOR;
typedef struct libusb_interface LIBUSB_INTERFACE;
typedef struct libusb_interface_descriptor LIBUSB_INTERFACE_DESCRIPTOR;
typedef struct libusb_endpoint_descriptor LIBUSB_ENDPOINT_DESCEIPTOR;
typedef struct libusb_interface LIBUSB_INTERFACE;
typedef struct libusb_interface_descriptor LIBUSB_INTERFACE_DESCRIPTOR;
typedef struct libusb_endpoint_descriptor LIBUSB_ENDPOINT_DESCEIPTOR;
typedef struct _UDEVICE UDEVICE;
struct _UDEVICE
{
IUDEVICE iface;
@ -75,11 +73,8 @@ struct _UDEVICE
};
typedef UDEVICE * PUDEVICE;
int
udev_new_by_id(UINT16_t idVendor, UINT16_t idProduct, IUDEVICE ***devArray);
IUDEVICE*
udev_new_by_addr(int bus_number, int dev_number);
int udev_new_by_id(UINT16 idVendor, UINT16 idProduct, IUDEVICE ***devArray);
IUDEVICE* udev_new_by_addr(int bus_number, int dev_number);
extern int libusb_debug;

4
cunit/test_mppc.c
View File

@ -636,8 +636,8 @@ int add_mppc_suite(void)
void test_mppc(void)
{
struct rdp_mppc_dec* rmppc;
UINT32_t roff;
UINT32_t rlen;
UINT32 roff;
UINT32 rlen;
long int dur;
struct timeval start_time;