X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fvcdx%2Fvcd.c;h=a63ed08286aa86fbcc9e95314c3f08674072a70d;hb=152b1687c0ec112f3ab1360006d048d6b9cf7258;hp=93bf8ec6cc08a386224b537202aa7543c343db13;hpb=05492281965ed211badf7e1f4c2220be720d3356;p=vlc

diff --git a/modules/access/vcdx/vcd.c b/modules/access/vcdx/vcd.c
index 93bf8ec6cc..a63ed08286 100644
--- a/modules/access/vcdx/vcd.c
+++ b/modules/access/vcdx/vcd.c
@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -37,23 +37,8 @@
 #include <vlc_plugin.h>
 #include <vlc_charset.h>
 
-/*****************************************************************************
- * Exported prototypes
- *****************************************************************************/
-int  VCDOpen       ( vlc_object_t * );
-void VCDClose      ( vlc_object_t * );
-int  VCDOpenIntf   ( vlc_object_t * );
-void VCDCloseIntf  ( vlc_object_t * );
-int  VCDInit   ( vlc_object_t * );
-void VCDEnd    ( vlc_object_t * );
-
-int  DebugCallback ( vlc_object_t *p_this, const char *psz_name,
-                         vlc_value_t oldval, vlc_value_t val,
-                         void *p_data );
-
-int  BlocksPerReadCallback ( vlc_object_t *p_this, const char *psz_name,
-                 vlc_value_t oldval, vlc_value_t val,
-                 void *p_data );
+#include "vcd.h"
+#include "access.h"
 
 /*****************************************************************************
  * Option help text
@@ -110,44 +95,44 @@ vlc_module_begin ()
     /* Configuration options */
     add_integer ( MODULE_STRING "-debug", 0, NULL,
                   N_("If nonzero, this gives additional debug information."),
-                  DEBUG_LONGTEXT, true );
+                  DEBUG_LONGTEXT, true )
 
     add_integer ( MODULE_STRING "-blocks-per-read", 20,
           NULL,
                   N_("Number of CD blocks to get in a single read."),
                   N_("Number of CD blocks to get in a single read."),
-          true );
+          true )
 
     add_bool( MODULE_STRING "-PBC", 0, NULL,
               N_("Use playback control?"),
               N_("If VCD is authored with playback control, use it. "
                  "Otherwise we play by tracks."),
-              false );
+              false )
 
     add_bool( MODULE_STRING "-track-length", true,
           NULL,
               N_("Use track length as maximum unit in seek?"),
               N_("If set, the length of the seek bar is the track rather than "
          "the length of an entry."),
-              false );
+              false )
 
     add_bool( MODULE_STRING "-extended-info", 0, NULL,
               N_("Show extended VCD info?"),
               N_("Show the maximum amount of information under Stream and "
                  "Media Info. Shows for example playback control navigation."),
-              false );
+              false )
 
     add_string( MODULE_STRING "-author-format",
                 "%v - %F disc %c of %C",
                 NULL,
                 N_("Format to use in the playlist's \"author\" field."),
-                VCD_TITLE_FMT_LONGTEXT, true );
+                VCD_TITLE_FMT_LONGTEXT, true )
 
     add_string( MODULE_STRING "-title-format",
                 "%I %N %L%S - %M %A %v - disc %c of %C %F",
                 NULL,
                 N_("Format to use in the playlist's \"title\" field."),
-                VCD_TITLE_FMT_LONGTEXT, false );
+                VCD_TITLE_FMT_LONGTEXT, false )
 
 vlc_module_end ()