diff options
Diffstat (limited to 'multimedia/xine-lib/patches/patch-ac')
| -rw-r--r-- | multimedia/xine-lib/patches/patch-ac | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/multimedia/xine-lib/patches/patch-ac b/multimedia/xine-lib/patches/patch-ac index d4d834b69a3..9f0459159f1 100644 --- a/multimedia/xine-lib/patches/patch-ac +++ b/multimedia/xine-lib/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ +$NetBSD: patch-ac,v 1.2 2004/03/11 17:26:02 jmmv Exp $ ---- src/audio_out/audio_sun_out.c.orig 2003-07-13 19:29:04.000000000 +0000 -+++ src/audio_out/audio_sun_out.c 2003-10-02 09:51:34.000000000 +0000 +--- src/audio_out/audio_sun_out.c.orig 2003-12-14 23:13:22.000000000 +0100 ++++ src/audio_out/audio_sun_out.c @@ -41,6 +41,11 @@ #ifdef __svr4__ #include <stropts.h> @@ -14,7 +14,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ #include "xine_internal.h" #include "xineutils.h" -@@ -89,7 +94,9 @@ +@@ -89,7 +94,9 @@ typedef struct sun_driver_s { uint32_t num_channels; int bytes_per_frame; @@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ enum { RTSC_UNKNOWN = 0, -@@ -113,12 +120,14 @@ +@@ -113,12 +120,14 @@ typedef struct sun_driver_s { unsigned buf_len; #endif @@ -39,15 +39,15 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ } sun_driver_t; -@@ -128,6 +137,7 @@ +@@ -128,6 +137,7 @@ typedef struct sun_driver_s { */ - static int realtime_samplecounter_available(char *dev) + static int realtime_samplecounter_available(xine_t *xine, char *dev) { +#ifndef __NetBSD__ int fd = -1; audio_info_t info; int rtsc_ok = RTSC_DISABLED; -@@ -246,6 +256,9 @@ +@@ -246,6 +256,9 @@ error: } return rtsc_ok; @@ -57,7 +57,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ } -@@ -431,7 +444,9 @@ +@@ -429,7 +442,9 @@ static int ao_sun_open(ao_driver_t *this this->mode = mode; this->input_sample_rate = rate; @@ -67,7 +67,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ /* * open audio device -@@ -463,6 +478,9 @@ +@@ -461,6 +476,9 @@ static int ao_sun_open(ao_driver_t *this info.play.sample_rate = this->input_sample_rate; info.play.eof = 0; info.play.samples = 0; @@ -77,7 +77,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ this->convert_u8_s8 = 0; -@@ -524,7 +542,9 @@ +@@ -522,7 +540,9 @@ static int ao_sun_open(ao_driver_t *this return 0; } @@ -87,7 +87,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ this->output_sample_rate = info.play.sample_rate; this->num_channels = info.play.channels; -@@ -566,6 +586,7 @@ +@@ -563,6 +583,7 @@ static int ao_sun_delay(ao_driver_t *thi sun_driver_t *this = (sun_driver_t *) this_gen; audio_info_t info; @@ -95,7 +95,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0 && (this->frames_in_buffer == 0 || info.play.samples > 0)) { -@@ -611,6 +632,10 @@ +@@ -609,6 +630,10 @@ static int ao_sun_delay(ao_driver_t *thi } #endif } @@ -106,7 +106,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ return NOT_REAL_TIME; } -@@ -719,7 +744,9 @@ +@@ -717,7 +742,9 @@ static int ao_sun_write(ao_driver_t *thi if (num_written > 0) { int buffered_samples; |