]> git.sesse.net Git - vlc/commitdiff
projects / vlc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f9ce508)
Move libcdio CD-DA plugin into its own directory before the big split up.
authorRocky Bernstein <rocky@videolan.org>
Wed, 26 Nov 2003 01:32:54 +0000 (01:32 +0000)
committerRocky Bernstein <rocky@videolan.org>
Wed, 26 Nov 2003 01:32:54 +0000 (01:32 +0000)
15 files changed:
configure.ac patch | blob | history
modules/access/cdda/Modules.am [new file with mode: 0644] patch | blob
modules/access/cdda/cdda.c [moved from modules/access/cddax.c with 95% similarity] patch | blob | history
po/de.po patch | blob | history
po/en_GB.po patch | blob | history
po/es.po patch | blob | history
po/fr.po patch | blob | history
po/it.po patch | blob | history
po/ja.po patch | blob | history
po/nl.po patch | blob | history
po/no.po patch | blob | history
po/pl.po patch | blob | history
po/pt_BR.po patch | blob | history
po/ru.po patch | blob | history
po/sv.po patch | blob | history

diff --git a/configure.ac b/configure.ac
index cb3380f393b4018923ebed50edf05e7374a90bb0..ce54a5971574a2ec7403c681c9d9e33261ea1f8c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 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
diff --git a/modules/access/cdda/Modules.am b/modules/access/cdda/Modules.am
new file mode 100644 (file)
index 0000000..a00cec1
--- /dev/null
+++ b/modules/access/cdda/Modules.am
@@ -0,0 +1,3 @@
+SOURCES_cddax = \
+       cdda.c \
+       $(NULL)
diff --git a/modules/access/cddax.c b/modules/access/cdda/cdda.c
similarity index 95%
rename from modules/access/cddax.c
rename to modules/access/cdda/cdda.c
index 1343808959d47a3649a6a1ade713f367932fa7c7..ca7f4aebdbf639ef8d7502f72cc78db5c56555b0 100644 (file)
--- a/modules/access/cddax.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: 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;
 
diff --git a/po/de.po b/po/de.po
index daa2c1d681645489a0a2c5c0c7dc1b02057cc9d1..cf7a3c3d0f7422694ba60ea60e14a9ba44340372 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -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 Kühne <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
diff --git a/po/en_GB.po b/po/en_GB.po
index ab1c97ad98ef1b4551a7281b3256100affd17d4d..ce5ae0a7c873b266e4cc156254654803167563d3 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -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"
diff --git a/po/es.po b/po/es.po
index 8d54bda3f7919e3246eb620c8546a50528b87f71..10d1089cf8f8b42b51e818994f1059ac9027b99d 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -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"
diff --git a/po/fr.po b/po/fr.po
index eaf76ed6e475c29f8222434baa0496724fb8fcf4..bdd375a1b3ac1472863ccaf19112e1b75ad8e222 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -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"
diff --git a/po/it.po b/po/it.po
index 9a2630eb146c374aff4cfba2f2af639809308f77..015a27d63a130b8b86cf433c5a5be194b3ba57b9 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -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
diff --git a/po/ja.po b/po/ja.po
index cdb35707c6e10dc2f261fa8b23273e43eb810cc0..efc820c60ae27c1de6f1897ee7368ea210034778 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -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
diff --git a/po/nl.po b/po/nl.po
index 7851b6590e418c96335090f4ae801f4c110b5335..d911d7c1667955a63fb6805c8f2d750d1eb0ac7f 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -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
diff --git a/po/no.po b/po/no.po
index ca3a34fcf0cace59c3469e12efae4f1bcfc33e00..c9a4808e205afdc7e65c94adf66999515bd75dd3 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -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
diff --git a/po/pl.po b/po/pl.po
index 737b9a8e8d7955b8e762096ceace500182f897fd..e9f15ef0fb01d745e755de20c753bf09d2973448 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -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
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 52a0245e9d56a35c40f0121fed302aceae47da3a..fab98a213d7e415430b276107986d50ce261740c 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -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"
diff --git a/po/ru.po b/po/ru.po
index e5127040e1ea822efeca57622228f7ffba791831..590c624bba007d895a4d64df7cf24fceb60763b0 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -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"
diff --git a/po/sv.po b/po/sv.po
index 26160cbc64ed64e61f43b11cc3e428dc85cc0046..e624fab594505c861cd959bf5d26468a9a8addb0 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -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"
Unnamed repository; edit this file 'description' to name the repository.