From a1f5d9f49ce8b610674ca04eddc24baf6b7a79ad Mon Sep 17 00:00:00 2001 From: Rocky Bernstein Date: Thu, 11 Dec 2003 12:56:25 +0000 Subject: [PATCH] Switch over to using "cd-audio" and "vcd" configuration variables. --- modules/access/cdda/access.c | 4 ++-- modules/access/cdda/cdda.c | 6 +----- modules/access/vcdx/access.c | 13 ++++++++----- modules/access/vcdx/vcd.c | 9 +-------- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c index 49555c54bf..6711354507 100644 --- a/modules/access/cdda/access.c +++ b/modules/access/cdda/access.c @@ -2,7 +2,7 @@ * cddax.c : CD digital audio input module for vlc using libcdio ***************************************************************************** * Copyright (C) 2000,2003 VideoLAN - * $Id: access.c,v 1.13 2003/12/05 02:33:49 rocky Exp $ + * $Id: access.c,v 1.14 2003/12/11 12:56:25 rocky Exp $ * * Authors: Rocky Bernstein * Laurent Aimar @@ -836,7 +836,7 @@ E_(Open)( vlc_object_t *p_this ) free( psz_orig ); return -1; } - psz_source = config_GetPsz( p_input, MODULE_STRING "-device" ); + psz_source = config_GetPsz( p_input, "cd-audio" ); if( !psz_source || 0==strlen(psz_source) ) { /* Scan for a CD-ROM drive with a CD-DA in it. */ diff --git a/modules/access/cdda/cdda.c b/modules/access/cdda/cdda.c index 4ff3b951d2..fb24a144a3 100644 --- a/modules/access/cdda/cdda.c +++ b/modules/access/cdda/cdda.c @@ -2,7 +2,7 @@ * cddax.c : CD digital audio input module for vlc using libcdio ***************************************************************************** * Copyright (C) 2000,2003 VideoLAN - * $Id: cdda.c,v 1.10 2003/12/05 02:33:49 rocky Exp $ + * $Id: cdda.c,v 1.11 2003/12/11 12:56:25 rocky Exp $ * * Authors: Rocky Bernstein * Laurent Aimar @@ -129,10 +129,6 @@ vlc_module_begin(); N_("Caching value in ms"), CACHING_LONGTEXT, VLC_TRUE ); - add_string( MODULE_STRING "-device", "", NULL, - N_("CD-ROM device name"), - DEV_LONGTEXT, VLC_FALSE ); - add_string( MODULE_STRING "-title-format", "%T %M", NULL, N_("Format to use in playlist 'title' field when no CDDB"), diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c index ada2d56289..0a94c5e5d1 100644 --- a/modules/access/vcdx/access.c +++ b/modules/access/vcdx/access.c @@ -3,8 +3,8 @@ * using libcdio, libvcd and libvcdinfo. vlc-specific things tend * to go here. ***************************************************************************** - * Copyright (C) 2000,2003 VideoLAN - * $Id: access.c,v 1.9 2003/12/05 05:01:17 rocky Exp $ + * Copyright (C) 2000, 2003 VideoLAN + * $Id: access.c,v 1.10 2003/12/11 12:56:25 rocky Exp $ * * Authors: Rocky Bernstein * Johan Bilien @@ -197,8 +197,10 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len ) *p_buf = 0x01; dbg_print(INPUT_DBG_STILL, "Handled still event"); +#if 1 p_vcd->p_intf->p_sys->b_still = 1; input_SetStatus( p_input, INPUT_STATUS_PAUSE ); +#endif vlc_mutex_lock( &p_input->stream.stream_lock ); @@ -207,9 +209,10 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len ) vlc_mutex_unlock( &p_input->stream.stream_lock ); - dbg_print(INPUT_DBG_STILL, "Clock manage"); input_ClockManageControl( p_input, p_pgrm, 0 ); - dbg_print(INPUT_DBG_STILL, "Clock manage done"); + + p_vcd->p_intf->p_sys->b_still = 1; + input_SetStatus( p_input, INPUT_STATUS_PAUSE ); return i_read + M2F2_SECTOR_SIZE; } @@ -825,7 +828,7 @@ VCDParse( input_thread_t * p_input, /*out*/ vcdinfo_itemid_t * p_itemid ) /* No source specified, so figure it out. */ if( !p_input->psz_access ) return NULL; - psz_source = config_GetPsz( p_input, MODULE_STRING "-device" ); + psz_source = config_GetPsz( p_input, "vcd" ); if( !psz_source || 0==strlen(psz_source) ) { /* Scan for a CD-ROM drive with a VCD in it. */ diff --git a/modules/access/vcdx/vcd.c b/modules/access/vcdx/vcd.c index aee102333f..9b3072c073 100644 --- a/modules/access/vcdx/vcd.c +++ b/modules/access/vcdx/vcd.c @@ -2,7 +2,7 @@ * vcd.c : VCD input module for vlc ***************************************************************************** * Copyright (C) 2000,2003 VideoLAN - * $Id: vcd.c,v 1.10 2003/11/30 13:53:45 rocky Exp $ + * $Id: vcd.c,v 1.11 2003/12/11 12:56:25 rocky Exp $ * * Authors: Rocky Bernstein * @@ -83,13 +83,6 @@ vlc_module_begin(); N_("set debug mask for additional debugging."), DEBUG_LONGTEXT, VLC_TRUE ); - add_string( MODULE_STRING "-device", "", NULL, - N_("VCD device name"), - N_("Specify the name of the Video Compact Disc device that " - "will be used by default. If you don't specify anything, " - "we'll scan for a suitable VCD device."), - VLC_FALSE ); - add_bool( MODULE_STRING "-PBC", 0, NULL, N_("Use playback control?"), N_("If VCD is authored with playback control, use it. " -- 2.39.5