diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-04 14:01:47 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-04 14:01:47 +0200 |
| commit | 60a408c3446733dc752979c1eab579c25a4a4897 (patch) | |
| tree | f897ecb51396ecf9f61c0f4219bf6f5a6287d380 /src/audio_out/audio_sun_out.c | |
| parent | 15d6933ee064a25f1b9753841fb87f261ea3e736 (diff) | |
| parent | bdbfc75de59531f8a4d8d85b7e0e58c95365cbd7 (diff) | |
| download | xine-lib-60a408c3446733dc752979c1eab579c25a4a4897.tar.gz xine-lib-60a408c3446733dc752979c1eab579c25a4a4897.tar.bz2 | |
Merge from main repo.
Diffstat (limited to 'src/audio_out/audio_sun_out.c')
| -rw-r--r-- | src/audio_out/audio_sun_out.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c index 93361d2f3..5923eb658 100644 --- a/src/audio_out/audio_sun_out.c +++ b/src/audio_out/audio_sun_out.c @@ -126,10 +126,10 @@ typedef struct sun_driver_s { #ifdef __svr4__ #if SW_SAMPLE_COUNT struct timeval tv0; - uint_t sample0; + size_t sample0; #endif - uint_t last_samplecnt; + size_t last_samplecnt; #endif } sun_driver_t; @@ -604,8 +604,8 @@ static int ao_sun_delay(ao_driver_t *this_gen) /* compute "current sample" based on real time */ { struct timeval tv1; - uint_t cur_sample; - uint_t msec; + size_t cur_sample; + size_t msec; gettimeofday(&tv1, NULL); @@ -807,7 +807,7 @@ static int ao_sun_get_property (ao_driver_t *this_gen, int property) { this->mixer_volume = info.play.gain * 100 / AUDIO_MAX_GAIN; } return this->mixer_volume; -#if !defined(__NetBSD__) /* audio_info.output_muted is missing on NetBSD */ +#ifdef HAVE_AUDIO_INFO_T_OUTPUT_MUTED case AO_PROP_MUTE_VOL: if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) < 0) return 0; @@ -836,7 +836,7 @@ static int ao_sun_set_property (ao_driver_t *this_gen, int property, int value) if (ioctl(this->audio_fd, AUDIO_SETINFO, &info) < 0) return ~value; return value; -#if !defined(__NetBSD__) /* audio_info.output_muted is missing on NetBSD */ +#ifdef HAVE_AUDIO_INFO_T_OUTPUT_MUTED case AO_PROP_MUTE_VOL: info.output_muted = value != 0; if (ioctl(this->audio_fd, AUDIO_SETINFO, &info) < 0) |