jvlc: code formatted

[vlc] / modules / demux / gme.cpp

diff --git a/modules/demux/gme.cpp b/modules/demux/gme.cpp
index 15f33c1825d6ddb19baa61dc210e7b269426414f..de1c285d0f6c8a1bf230d2fbaed9f49810601f63 100644 (file)
--- a/modules/demux/gme.cpp
+++ b/modules/demux/gme.cpp
@@ -25,7 +25,12 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 
 #include "Nsf_Emu.h"
 #include "Gbs_Emu.h"
@@ -47,8 +52,8 @@ static void Close  ( vlc_object_t * );
 
 vlc_module_begin();
     set_shortname( "GME");
-    set_description( _("GME demuxer (Game_Music_Emu)" ) );
-    set_capability( "demux2", 10 );
+    set_description( N_("GME demuxer (Game_Music_Emu)" ) );
+    set_capability( "demux", 10 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_callbacks( Open, Close );
@@ -114,7 +119,7 @@ static int Open( vlc_object_t *p_this )
     vlc_value_t val;
  
     /* We accept file based on extention match */
-    if( strcasecmp( p_demux->psz_demux, "gme" ) )
+    if( !p_demux->b_force )
     {
         if( ( ext = strrchr( p_demux->psz_path, '.' ) ) == NULL ||
             stream_Size( p_demux->s ) == 0 ) return VLC_EGENERIC;