Skip to content

V
vlc-2-2
Commit 092eac7a authored by Rocky Bernstein's avatar Rocky Bernstein
Browse files
Options

Move libcdio CD-DA plugin into its own directory before the big split up.

parent f9ce508b
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 37 deletions
configure.ac
View file @ 092eac7a
dnl Autoconf settings for vlc
dnl $Id: configure.ac,v 1.121 2003/11/24 18:00:10 gbazin Exp $
dnl $Id: configure.ac,v 1.122 2003/11/26 01:32:52 rocky Exp $
AC_INIT(vlc,0.7.0-test1)
......@@ -3487,6 +3487,7 @@ AC_OUTPUT([
modules/access/pvr/Makefile
modules/access/satellite/Makefile
modules/access/v4l/Makefile
modules/access/cdda/Makefile
modules/access/vcd/Makefile
modules/access/vcdx/Makefile
modules/access_output/Makefile
......
modules/access/cdda/Modules.am 0 → 100644
View file @ 092eac7a
SOURCES_cddax = \
cdda.c \
$(NULL)
modules/access/cddax.c → modules/access/cdda/cdda.c
View file @ 092eac7a
......@@ -2,7 +2,7 @@
* cddax.c : CD digital audio input module for vlc using libcdio
*****************************************************************************
* Copyright (C) 2000,2003 VideoLAN
* $Id: cddax.c,v 1.9 2003/11/25 03:54:33 rocky Exp $
* $Id: cdda.c,v 1.1 2003/11/26 01:32:52 rocky Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
......@@ -45,9 +45,9 @@
#include <string.h>
#include "vcdx/cdrom.h"
#include "../vcdx/cdrom.h"
/* how many blocks CDDAOpen will read in each loop */
/* how many blocks E_(Open) will read in each loop */
#define CDDA_BLOCKS_ONCE 1
#define CDDA_DATA_ONCE (CDDA_BLOCKS_ONCE * CDIO_CD_FRAMESIZE_RAW)
......@@ -119,27 +119,26 @@ static input_thread_t *p_cdda_input = NULL;
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int CDDAOpen ( vlc_object_t * );
static void CDDAClose ( vlc_object_t * );
static int E_(Open) ( vlc_object_t * );
static void E_(Close) ( vlc_object_t * );
static int E_(OpenIntf) ( vlc_object_t * );
static void E_(CloseIntf) ( vlc_object_t * );
static int CDDARead ( input_thread_t *, byte_t *, size_t );
static void CDDASeek ( input_thread_t *, off_t );
static int CDDASetArea ( input_thread_t *, input_area_t * );
static int CDDAPlay ( input_thread_t *, int );
static int CDDASetProgram ( input_thread_t *, pgrm_descriptor_t * );
static int CDDAOpenIntf ( vlc_object_t * );
static void CDDACloseIntf ( vlc_object_t * );
static int InitThread ( intf_thread_t *p_intf );
static int KeyEvent ( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static void RunIntf ( intf_thread_t *p_intf );
static int debug_callback ( vlc_object_t *p_this, const char *psz_name,
vlc_value_t oldval, vlc_value_t val,
void *p_data );
static int E_(DebugCallback) ( vlc_object_t *p_this, const char *psz_name,
vlc_value_t oldval, vlc_value_t val,
void *p_data );
/*****************************************************************************
* Module descriptor
......@@ -154,15 +153,17 @@ static void DemuxClose ( vlc_object_t * );
"value should be set in miliseconds units." )
vlc_module_begin();
set_description( _("CD Audio input") );
add_usage_hint( N_("cddax://[device-or-file][@num]") );
set_description( _("Compact Disc Digital Audio (CD-DA) input") );
set_capability( "access", 75 /* slightly higher than cdda */ );
add_integer( "cddax-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
set_callbacks( CDDAOpen, CDDAClose );
set_callbacks( E_(Open), E_(Close) );
add_shortcut( "cdda" );
add_shortcut( "cddax" );
/* Configuration options */
add_category_hint( N_("CDX"), NULL, VLC_TRUE );
add_integer ( MODULE_STRING "-debug", 0, debug_callback, DEBUG_TEXT,
add_integer ( MODULE_STRING "-debug", 0, E_(DebugCallback), DEBUG_TEXT,
DEBUG_LONGTEXT, VLC_TRUE );
add_string( MODULE_STRING "-device", "", NULL, DEV_TEXT,
DEV_LONGTEXT, VLC_TRUE );
......@@ -175,7 +176,7 @@ vlc_module_begin();
add_submodule();
set_capability( "interface", 0 );
set_callbacks( E_(CDDAOpenIntf), E_(CDDACloseIntf) );
set_callbacks( E_(OpenIntf), E_(CloseIntf) );
vlc_module_end();
......@@ -184,8 +185,8 @@ vlc_module_end();
****************************************************************************/
static int
debug_callback ( vlc_object_t *p_this, const char *psz_name,
vlc_value_t oldval, vlc_value_t val, void *p_data )
E_(DebugCallback) ( vlc_object_t *p_this, const char *psz_name,
vlc_value_t oldval, vlc_value_t val, void *p_data )
{
cdda_data_t *p_cdda;
......@@ -229,9 +230,9 @@ cdio_log_handler (cdio_log_level_t level, const char message[])
/*****************************************************************************
* CDDAOpen: open cdda
* E_(Open): open cdda
*****************************************************************************/
static int CDDAOpen( vlc_object_t *p_this )
static int E_(Open)( vlc_object_t *p_this )
{
input_thread_t * p_input = (input_thread_t *)p_this;
char * psz_orig;
......@@ -405,10 +406,10 @@ CDDAPlay( input_thread_t *p_input, int i_track )
}
/*****************************************************************************
* CDDAClose: closes cdda
* E_(Close): closes cdda
*****************************************************************************/
static void
CDDAClose( vlc_object_t *p_this )
E_(Close)( vlc_object_t *p_this )
{
input_thread_t * p_input = (input_thread_t *)p_this;
cdda_data_t *p_cdda = (cdda_data_t *)p_input->p_access_data;
......@@ -659,7 +660,7 @@ static int Demux( input_thread_t * p_input )
/*****************************************************************************
* OpenIntf: initialize dummy interface
*****************************************************************************/
int CDDAOpenIntf ( vlc_object_t *p_this )
int E_(OpenIntf) ( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
......@@ -680,7 +681,7 @@ int CDDAOpenIntf ( vlc_object_t *p_this )
/*****************************************************************************
* CloseIntf: destroy dummy interface
*****************************************************************************/
void CDDACloseIntf ( vlc_object_t *p_this )
void E_(CloseIntf) ( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
......
po/de.po
View file @ 092eac7a
......@@ -7,7 +7,6 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc 0.73.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-11-23 19:29+0100\n"
"PO-Revision-Date: 2002-04-18 23:38+0100\n"
"Last-Translator: Felix Khne <fk@aenneburghardt.de>\n"
......@@ -15,6 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32
#, fuzzy
......
po/en_GB.po
View file @ 092eac7a
......@@ -17,7 +17,6 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-11-23 19:29+0100\n"
"PO-Revision-Date: 2002-04-22 09:56+0200\n"
"Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
......@@ -25,6 +24,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32
msgid "VLC Preferences"
......
po/es.po
View file @ 092eac7a
......@@ -6,7 +6,6 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-11-23 19:29+0100\n"
"PO-Revision-Date: 2002-04-22 09:56+0200\n"
"Last-Translator: Antonio Javier Varela <tonxabar@hotmail.com>\n"
......@@ -14,6 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32
msgid "VLC Preferences"
......
po/fr.po
View file @ 092eac7a
......@@ -6,7 +6,6 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-11-23 19:29+0100\n"
"PO-Revision-Date: 2001-12-10 13:32+0100\n"
"Last-Translator: Jean-Pierre Kuypers <Kuypers@sri.ucl.ac.be> 2003-07-27\n"
......@@ -14,6 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32
msgid "VLC Preferences"
......
po/it.po
View file @ 092eac7a
......@@ -6,7 +6,6 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-11-23 19:29+0100\n"
"PO-Revision-Date: 2003-07-24 15:00+0100\n"
"Last-Translator: Vella Bruno\n"
......@@ -14,6 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32
#, fuzzy
......
po/ja.po
View file @ 092eac7a
......@@ -4,7 +4,6 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-11-23 19:29+0100\n"
"PO-Revision-Date: 2003-01-09 02:37+0900\n"
"Last-Translator: Fumio Nakayama <endymion@ca2.so-net.ne.jp>\n"
......@@ -12,6 +11,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=euc-jp\n"
"Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32
#, fuzzy
......
po/nl.po
View file @ 092eac7a
......@@ -6,7 +6,6 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-11-23 19:29+0100\n"
"PO-Revision-Date: 2002-04-20 16:58GMT\n"
"Last-Translator: Derk-Jan Hartman <thedj at sf.net>\n"
......@@ -14,6 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
"X-Generator: KBabel 0.8\n"
#: include/vlc_help.h:32
......
po/no.po
View file @ 092eac7a
......@@ -4,7 +4,6 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-11-23 19:29+0100\n"
"PO-Revision-Date: 2003-04-06 12:32+0200\n"
"Last-Translator: Haakon Meland Eriksen <haakon.eriksen@far.no>\n"
......@@ -12,6 +11,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32
#, fuzzy
......
po/pl.po
View file @ 092eac7a
......@@ -5,7 +5,6 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-11-23 19:29+0100\n"
"PO-Revision-Date: 2002-07-12 11:49+0100\n"
"Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
......@@ -13,6 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32
#, fuzzy
......
po/pt_BR.po
View file @ 092eac7a
......@@ -6,7 +6,6 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-11-23 19:29+0100\n"
"PO-Revision-Date: 2003-08-16 18:31+0200\n"
"Last-Translator: Andr de Barros Martins Ribeiro <andrerib@ajato.com.br>\n"
......@@ -14,6 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32
msgid "VLC Preferences"
......
po/ru.po
View file @ 092eac7a
......@@ -5,7 +5,6 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-11-23 19:29+0100\n"
"PO-Revision-Date: 2001-02-19 19:58+03:00\n"
"Last-Translator: Valek Filippov <frob@df.ru>\n"
......@@ -13,6 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=koi8-r\n"
"Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32
msgid "VLC Preferences"
......
po/sv.po
View file @ 092eac7a
......@@ -6,7 +6,6 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-11-23 19:29+0100\n"
"PO-Revision-Date: 2002-07-23 23:00+0200\n"
"Last-Translator: Joel Arvidsson <dogai@privat.utfors.se>\n"
......@@ -14,6 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32
msgid "VLC Preferences"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment