X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Farts.c;h=68c926feafcfda0c34cfcacda1b3c4a7ed8a2494;hb=666c5ea213613b231c1c0d4e24e27b4e2c9f59a5;hp=71b82920d6f986bc8076b76734509dde1bd4e7f1;hpb=54929735f8c480fcbdecb870e97405670acc6ce8;p=vlc diff --git a/modules/audio_output/arts.c b/modules/audio_output/arts.c index 71b82920d6..68c926feaf 100644 --- a/modules/audio_output/arts.c +++ b/modules/audio_output/arts.c @@ -1,8 +1,8 @@ /***************************************************************************** * arts.c : aRts module ***************************************************************************** - * Copyright (C) 2001-2002 VideoLAN - * $Id: arts.c,v 1.14 2002/10/20 12:23:47 massiot Exp $ + * Copyright (C) 2001-2002 the VideoLAN team + * $Id$ * * Authors: Emmanuel Blindauer * Samuel Hocevar @@ -11,7 +11,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -19,22 +19,18 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* ENOMEM */ -#include /* open(), O_WRONLY */ #include /* strerror() */ #include /* write(), close() */ #include /* calloc(), malloc(), free() */ #include -#include - -#include "aout_internal.h" +#include #include @@ -58,14 +54,16 @@ struct aout_sys_t static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); static void Play ( aout_instance_t * ); -static int aRtsThread ( aout_instance_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ vlc_module_begin(); - set_description( _("aRts audio module") ); + set_shortname( "aRts" ); + set_description( _("aRts audio output") ); set_capability( "audio output", 50 ); + set_category( CAT_AUDIO ); + set_subcategory( SUBCAT_AUDIO_AOUT ); set_callbacks( Open, Close ); vlc_module_end(); @@ -84,17 +82,17 @@ static int Open( vlc_object_t *p_this ) if( p_sys == NULL ) { msg_Err( p_aout, "out of memory" ); - return -1; + return VLC_ENOMEM; } p_aout->output.p_sys = p_sys; i_err = arts_init(); - - if (i_err < 0) + + if( i_err < 0 ) { msg_Err( p_aout, "arts_init failed (%s)", arts_error_text(i_err) ); free( p_sys ); - return -1; + return VLC_EGENERIC; } p_aout->output.pf_play = Play; @@ -106,7 +104,8 @@ static int Open( vlc_object_t *p_this ) { /* aRts doesn't support more than two channels. */ i_nb_channels = 2; - p_aout->output.output.i_channels = AOUT_CHAN_STEREO; + p_aout->output.output.i_physical_channels = + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; } /* Open a socket for playing a stream, set format to 16 bits */ @@ -116,7 +115,7 @@ static int Open( vlc_object_t *p_this ) { msg_Err( p_aout, "cannot open aRts socket" ); free( p_sys ); - return -1; + return VLC_EGENERIC; } /* Try not to bufferize more than 200 ms */ @@ -132,107 +131,54 @@ static int Open( vlc_object_t *p_this ) arts_stream_get( p_sys->stream, ARTS_P_PACKET_COUNT ), arts_stream_get( p_sys->stream, ARTS_P_PACKET_SIZE ) ); - p_aout->output.i_nb_samples = p_sys->i_size / sizeof(u16) / i_nb_channels; - - /* Create aRts thread and wait for its readiness. */ - if( vlc_thread_create( p_aout, "aout", aRtsThread, - VLC_THREAD_PRIORITY_OUTPUT, VLC_FALSE ) ) - { - msg_Err( p_aout, "cannot create aRts thread (%s)", strerror(errno) ); - arts_close_stream( p_sys->stream ); - arts_free(); - free( p_sys ); - return -1; - } + p_aout->output.i_nb_samples = p_sys->i_size / sizeof(uint16_t) + / i_nb_channels; - return 0; + return VLC_SUCCESS; } /***************************************************************************** * Play: nothing to do *****************************************************************************/ static void Play( aout_instance_t *p_aout ) -{ - ; -} - -/***************************************************************************** - * Close: close the aRts socket - *****************************************************************************/ -static void Close( vlc_object_t *p_this ) -{ - aout_instance_t *p_aout = (aout_instance_t *)p_this; - struct aout_sys_t * p_sys = p_aout->output.p_sys; - - p_aout->b_die = 1; - vlc_thread_join( p_aout ); - - arts_close_stream( p_sys->stream ); - arts_free(); - free( p_sys ); -} - -/***************************************************************************** - * aRtsThread: asynchronous thread used to DMA the data to the device - *****************************************************************************/ -static int aRtsThread( aout_instance_t * p_aout ) { struct aout_sys_t * p_sys = p_aout->output.p_sys; -mtime_t calldate = mdate(); + aout_buffer_t * p_buffer; + int i_tmp; - while ( !p_aout->b_die ) +#if 0 + while( arts_stream_get( p_sys->stream, ARTS_P_BUFFER_SPACE ) < 16384*3/2 ) { - aout_buffer_t * p_buffer; - int i_tmp, i_size; - byte_t * p_bytes; - -fprintf(stderr, "can write %i\n", arts_stream_get( p_sys->stream, ARTS_P_BUFFER_SPACE ) ); -while( arts_stream_get( p_sys->stream, ARTS_P_BUFFER_SPACE ) < 16384*3/2 ) -{ -fprintf(stderr, "sleep\n"); - msleep( 10000 ); -} -fprintf(stderr, "after sleep: can write %i\n", arts_stream_get( p_sys->stream, ARTS_P_BUFFER_SPACE ) ); + msleep( 10000 ); + } +#endif - /* Get the presentation date of the next write() operation. It - * is equal to the current date + latency */ - p_buffer = aout_OutputNextBuffer( p_aout, mdate() + p_sys->latency / 4, - VLC_TRUE ); + p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo ); - if ( p_buffer != NULL ) - { -fprintf(stderr, "buffer duration %lld, bytes %i\n", p_buffer->end_date - p_buffer->start_date, p_buffer->i_nb_bytes); - p_bytes = p_buffer->p_buffer; - i_size = p_buffer->i_nb_bytes; - } - else - { - i_size = p_sys->i_size; - p_bytes = malloc( i_size ); - memset( p_bytes, 0, i_size ); - } - -fprintf(stderr, "WRITING %i bytes\n", i_size); - i_tmp = arts_write( p_sys->stream, p_bytes, i_size ); -fprintf(stderr, "mdate: %lld\n", mdate() - calldate); -calldate = mdate(); -fprintf(stderr, "can write %i\n", arts_stream_get( p_sys->stream, ARTS_P_BUFFER_SPACE ) ); + if( p_buffer != NULL ) + { + i_tmp = arts_write( p_sys->stream, p_buffer->p_buffer, + p_buffer->i_nb_bytes ); if( i_tmp < 0 ) { msg_Err( p_aout, "write failed (%s)", arts_error_text(i_tmp) ); } - if ( p_buffer != NULL ) - { - aout_BufferFree( p_buffer ); - } - else - { - free( p_bytes ); - } + aout_BufferFree( p_buffer ); } +} - return 0; +/***************************************************************************** + * Close: close the aRts socket + *****************************************************************************/ +static void Close( vlc_object_t *p_this ) +{ + aout_instance_t *p_aout = (aout_instance_t *)p_this; + struct aout_sys_t * p_sys = p_aout->output.p_sys; + + arts_close_stream( p_sys->stream ); + arts_free(); + free( p_sys ); }