X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmod.c;h=399bc00ab9f70d1294e4e1c17527160879b80393;hb=6e41ca0135153181e3a922f0347154c4b83bac0e;hp=8b17665fbe968f90206457dad645fc258268840c;hpb=fe087a38282e93addb25fa9598393e40ea233b09;p=vlc diff --git a/modules/demux/mod.c b/modules/demux/mod.c index 8b17665fbe..399bc00ab9 100644 --- a/modules/demux/mod.c +++ b/modules/demux/mod.c @@ -18,16 +18,20 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include #include @@ -44,26 +48,53 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); +#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)." ) +#define REVERB_DELAY_LONGTEXT N_("Reverberation delay, in ms." \ + " Usual values are from to 40 to 200ms." ) +#define MEGABASS_LONGTEXT N_( "Enable megabass mode" ) +#define MEGABASS_LEVEL_LONGTEXT N_("Megabass mode level (from 0 to 100, " \ + "default value is 0)." ) +#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." ) +#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." ) + vlc_module_begin(); set_shortname( "MOD"); - set_description( _("MOD demuxer (libmodplug)" ) ); - set_capability( "demux2", 10 ); + set_description( N_("MOD demuxer (libmodplug)" ) ); + set_capability( "demux", 10 ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_DEMUX ); - add_bool( "mod-noisereduction", VLC_TRUE, NULL, N_("Noise reduction"), N_("Noise reduction"), VLC_FALSE ); - - add_bool( "mod-reverb", VLC_FALSE, NULL, N_("Reverb"), N_("Reverb"), VLC_FALSE ); - add_integer_with_range( "mod-reverb-level", 0, 0, 100, NULL, N_("Reverb level (0-100)"), N_("Reverb level (0-100 defaults to 0)"), VLC_FALSE ); - add_integer_with_range( "mod-reverb-delay", 40, 0, 1000, NULL, N_("Reverb delay (ms)"), N_("Reverb delay in ms (usually 40-200ms)"), VLC_FALSE ); - - add_bool( "mod-megabass", VLC_FALSE, NULL, N_("Mega bass"), N_("Mega bass"), VLC_FALSE ); - add_integer_with_range( "mod-megabass-level", 0, 0, 100, NULL, N_("Mega bass level (0-100)"), N_("Mega bass level (0-100 defaults to 0)"), VLC_FALSE ); - add_integer_with_range( "mod-megabass-range", 10, 10, 100, NULL, N_("Mega bass cut off (Hz)"), N_("Mega bass cut off (10-100Hz)"), VLC_FALSE ); - - add_bool( "mod-surround", VLC_FALSE, NULL, N_("Surround"), N_("Surround"), VLC_FALSE ); - add_integer_with_range( "mod-surround-level", 0, 0, 100, NULL, N_("Surround level (0-100)"), N_("Surround level (0-100 defaults to 0)"), VLC_FALSE ); - add_integer_with_range( "mod-surround-delay", 5, 0, 1000, NULL, N_("Surround delay (ms)"), N_("Surround delay in ms (usually 5-40ms)"), VLC_FALSE ); + add_bool( "mod-noisereduction", true, NULL, N_("Noise reduction"), + NOISE_LONGTEXT, false ); + + add_bool( "mod-reverb", false, NULL, N_("Reverb"), + REVERB_LONGTEXT, false ); + add_integer_with_range( "mod-reverb-level", 0, 0, 100, NULL, + N_("Reverberation level"), REVERB_LEVEL_LONGTEXT, true ); + add_integer_with_range( "mod-reverb-delay", 40, 0, 1000, NULL, + N_("Reverberation delay"), REVERB_DELAY_LONGTEXT, true ); + + add_bool( "mod-megabass", false, NULL, N_("Mega bass"), + MEGABASS_LONGTEXT, false ); + add_integer_with_range( "mod-megabass-level", 0, 0, 100, NULL, + N_("Mega bass level"), MEGABASS_LEVEL_LONGTEXT, true ); + add_integer_with_range( "mod-megabass-range", 10, 10, 100, NULL, + N_("Mega bass cutoff"), MEGABASS_RANGE_LONGTEXT, true ); + + add_bool( "mod-surround", false, NULL, N_("Surround"), N_("Surround"), + false ); + add_integer_with_range( "mod-surround-level", 0, 0, 100, NULL, + N_("Surround level"), SURROUND_LEVEL_LONGTEXT, true ); + add_integer_with_range( "mod-surround-delay", 5, 0, 1000, NULL, + N_("Surround delay (ms)"), SURROUND_DELAY_LONGTEXT, true ); set_callbacks( Open, Close ); add_shortcut( "mod" ); @@ -103,15 +134,15 @@ 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 extention match */ - if( strcasecmp( p_demux->psz_demux, "mod" ) ) + /* We accept file based on extension match */ + if( !p_demux->b_force ) { - if( ( ext = strchr( p_demux->psz_path, '.' ) ) == NULL || + char *ext; + int i; + if( ( ext = strrchr( p_demux->psz_path, '.' ) ) == NULL || stream_Size( p_demux->s ) == 0 ) return VLC_EGENERIC; ext++; /* skip . */ @@ -202,7 +233,7 @@ static int Open( vlc_object_t *p_this ) p_sys->i_time = 1; p_sys->i_length = ModPlug_GetLength( p_sys->f ) * (int64_t)1000; - msg_Dbg( p_demux, "MOD loaded name=%s lenght="I64Fd"ms", + msg_Dbg( p_demux, "MOD loaded name=%s lenght=%"PRId64"ms", ModPlug_GetName( p_sys->f ), p_sys->i_length ); @@ -242,16 +273,18 @@ static int Demux( demux_t *p_demux ) block_t *p_frame; int i_bk = ( p_sys->fmt.audio.i_bitspersample / 8 ) * p_sys->fmt.audio.i_channels; + int i_read; p_frame = block_New( p_demux, p_sys->fmt.audio.i_rate / 10 * i_bk ); - p_frame->i_buffer = ModPlug_Read( p_sys->f, p_frame->p_buffer, p_frame->i_buffer ); - if( p_frame->i_buffer <= 0 ) + i_read = ModPlug_Read( p_sys->f, p_frame->p_buffer, p_frame->i_buffer ); + if( i_read <= 0 ) { /* EOF */ block_Release( p_frame ); return 0; } + p_frame->i_buffer = i_read; /* Set PCR */ es_out_Control( p_demux->out, ES_OUT_SET_PCR, (int64_t)p_sys->i_time );