misc/objects.c: Don't rely on vlc_object_destroy() to destroy objects, but expects...

[vlc] / modules / demux / mod.c

diff --git a/modules/demux/mod.c b/modules/demux/mod.c
index 12731ac234c095d8016c541299b22dc629082a95..659215d1d6727501e111e5eafcf0484d0bc29a7a 100644 (file)
--- a/modules/demux/mod.c
+++ b/modules/demux/mod.c
@@ -24,7 +24,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
 #include <vlc_demux.h>
@@ -44,8 +47,7 @@
 static int  Open    ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 
-/// \bug [String] missing .
-#define NOISE_LONGTEXT N_("Enable noise reduction algorithm")
+#define NOISE_LONGTEXT N_("Enable noise reduction algorithm.")
 #define REVERB_LONGTEXT N_("Enable reverberation" )
 #define REVERB_LEVEL_LONGTEXT N_( "Reverberation level (from 0 " \
                 "to 100, default value is 0)." )
@@ -54,14 +56,13 @@ static void Close  ( vlc_object_t * );
 #define MEGABASS_LONGTEXT N_( "Enable megabass mode" )
 #define MEGABASS_LEVEL_LONGTEXT N_("Megabass mode level (from 0 to 100, " \
                 "default value is 0)." )
-/// \bug [String] Missing space after dot
-#define MEGABASS_RANGE_LONGTEXT N_("Megabass mode cutoff frequency, in Hz." \
+#define MEGABASS_RANGE_LONGTEXT N_("Megabass mode cutoff frequency, in Hz. " \
                 "This is the maximum frequency for which the megabass " \
-                "effect applies. Valid values are from 10 to 100 Hz" )
+                "effect applies. Valid values are from 10 to 100 Hz." )
 #define SURROUND_LEVEL_LONGTEXT N_( "Surround effect level (from 0 to 100, " \
                 "default value is 0)." )
 #define SURROUND_DELAY_LONGTEXT N_("Surround delay, in ms. Usual values are " \
-                "from 5 to 40 ms" )
+                "from 5 to 40 ms." )
 
 vlc_module_begin();
     set_shortname( "MOD");
@@ -132,14 +133,14 @@ static int Open( vlc_object_t *p_this )
 {
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys;
-    char        *ext;
-    int         i;
     ModPlug_Settings settings;
     vlc_value_t val;
 
     /* We accept file based on extension match */
-    if( strcasecmp( p_demux->psz_demux, "mod" ) )
+    if( !p_demux->b_force )
     {
+        char *ext;
+        int i;
         if( ( ext = strrchr( p_demux->psz_path, '.' ) ) == NULL ||
             stream_Size( p_demux->s ) == 0 ) return VLC_EGENERIC;