Skip to content

V
vlc-1.1
Commit 9ceb12b9 authored by Jérome Decoodt's avatar Jérome Decoodt
Browse files
Options

*.nib: continuous sliders 

intf: Equalizer window in window menu
equalizer.m: presets should work now
equalizer.c, Modules.am, equalizer_presets.h: presets are stored in a separate file
parent 302caa01
Expand all Show whitespace changes
Inline Side-by-side
Showing with 426 additions and 423 deletions
extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
View file @ 9ceb12b9
......@@ -63,9 +63,10 @@
CLASS = VLCEqualizer;
LANGUAGE = ObjC;
OUTLETS = {
"o_btn_2pass" = id;
"o_btn_enable" = id;
"o_btn_equalizer" = id;
"o_ckb_2pass" = id;
"o_ckb_enable" = id;
"o_fld_preamp" = id;
"o_popup_presets" = id;
"o_slider_band1" = id;
"o_slider_band10" = id;
......@@ -168,6 +169,7 @@
"o_mi_device" = id;
"o_mi_documentation" = id;
"o_mi_double_window" = id;
"o_mi_equalizer" = id;
"o_mi_faster" = id;
"o_mi_fittoscreen" = id;
"o_mi_floatontop" = id;
......
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
View file @ 9ceb12b9
......@@ -21,11 +21,11 @@
</array>
<key>IBOpenObjects</key>
<array>
<integer>21</integer>
<integer>2029</integer>
<integer>29</integer>
<integer>2029</integer>
<integer>21</integer>
</array>
<key>IBSystem Version</key>
<string>7H63</string>
<string>7M34</string>
</dict>
</plist>
modules/audio_filter/Modules.am
View file @ 9ceb12b9
SOURCES_equalizer = equalizer.c
SOURCES_equalizer = equalizer.c equalizer.h
SOURCES_normvol = normvol.c
modules/audio_filter/equalizer.c
View file @ 9ceb12b9
......@@ -32,6 +32,7 @@
#include <vlc/aout.h>
#include "aout_internal.h"
#include "equalizer_presets.h"
/* TODO:
* - add tables for other rates ( 22500, 11250, ...)
* - optimize a bit (you can hardly do slower ;)
......@@ -60,18 +61,6 @@ static void Close( vlc_object_t * );
#define PREAMP_TEXT N_("Global gain" )
#define PREAMP_LONGTEXT N_("Set the global gain in dB (-20 ... 20)" )
static char *preset_list[] = {
"flat", "classical", "club", "dance", "fullbass", "fullbasstreble",
"fulltreble", "headphones","largehall", "live", "party", "pop", "reggae",
"rock", "ska", "soft", "softrock", "techno"
};
static char *preset_list_text[] = {
N_("Flat"), N_("Classical"), N_("Club"), N_("Dance"), N_("Full bass"),
N_("Full bass and treble"), N_("Full treble"), N_("Headphones"),
N_("Large Hall"), N_("Live"), N_("Party"), N_("Pop"), N_("Reggae"),
N_("Rock"), N_("Ska"), N_("Soft"), N_("Soft rock"), N_("Techno"),
};
vlc_module_begin();
set_description( _("Equalizer 10 bands") );
set_capability( "audio filter", 0 );
......@@ -91,7 +80,6 @@ vlc_module_end();
/*****************************************************************************
* Local prototypes
*****************************************************************************/
#define EQZ_BANDS_MAX 10
typedef struct aout_filter_sys_t
{
/* Filter static config */
......@@ -248,130 +236,6 @@ static const eqz_config_t eqz_config_48000_10b =
}
};
typedef struct
{
char *psz_name;
int i_band;
float f_preamp;
float f_amp[EQZ_BANDS_MAX];
} eqz_preset_t;
static const eqz_preset_t eqz_preset_flat_10b=
{
"flat", 10, 12.0,
{ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 },
};
static const eqz_preset_t eqz_preset_classical_10b=
{
"classical", 10, 12.0,
{ -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, -7.2, -7.2, -7.2, -9.6 }
};
static const eqz_preset_t eqz_preset_club_10b=
{
"club", 10, 6.0,
{ -1.11022e-15, -1.11022e-15, 8, 5.6, 5.6, 5.6, 3.2, -1.11022e-15, -1.11022e-15, -1.11022e-15 }
};
static const eqz_preset_t eqz_preset_dance_10b=
{
"dance", 10, 5.0,
{ 9.6, 7.2, 2.4, -1.11022e-15, -1.11022e-15, -5.6, -7.2, -7.2, -1.11022e-15, -1.11022e-15 }
};
static const eqz_preset_t eqz_preset_fullbass_10b=
{
"fullbass", 10, 5.0,
{ -8, 9.6, 9.6, 5.6, 1.6, -4, -8, -10.4, -11.2, -11.2 }
};
static const eqz_preset_t eqz_preset_fullbasstreble_10b=
{
"fullbasstreble", 10, 4.0,
{ 7.2, 5.6, -1.11022e-15, -7.2, -4.8, 1.6, 8, 11.2, 12, 12 }
};
static const eqz_preset_t eqz_preset_fulltreble_10b=
{
"fulltreble", 10, 3.0,
{ -9.6, -9.6, -9.6, -4, 2.4, 11.2, 16, 16, 16, 16.8 }
};
static const eqz_preset_t eqz_preset_headphones_10b=
{
"headphones", 10, 4.0,
{ 4.8, 11.2, 5.6, -3.2, -2.4, 1.6, 4.8, 9.6, 12.8, 14.4 }
};
static const eqz_preset_t eqz_preset_largehall_10b=
{
"largehall", 10, 5.0,
{ 10.4, 10.4, 5.6, 5.6, -1.11022e-15, -4.8, -4.8, -4.8, -1.11022e-15, -1.11022e-15 }
};
static const eqz_preset_t eqz_preset_live_10b=
{
"live", 10, 7.0,
{ -4.8, -1.11022e-15, 4, 5.6, 5.6, 5.6, 4, 2.4, 2.4, 2.4 }
};
static const eqz_preset_t eqz_preset_party_10b=
{
"party", 10, 6.0,
{ 7.2, 7.2, -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, 7.2, 7.2 }
};
static const eqz_preset_t eqz_preset_pop_10b=
{
"pop", 10, 6.0,
{ -1.6, 4.8, 7.2, 8, 5.6, -1.11022e-15, -2.4, -2.4, -1.6, -1.6 }
};
static const eqz_preset_t eqz_preset_reggae_10b=
{
"reggae", 10, 8.0,
{ -1.11022e-15, -1.11022e-15, -1.11022e-15, -5.6, -1.11022e-15, 6.4, 6.4, -1.11022e-15, -1.11022e-15, -1.11022e-15 }
};
static const eqz_preset_t eqz_preset_rock_10b=
{
"rock", 10, 5.0,
{ 8, 4.8, -5.6, -8, -3.2, 4, 8.8, 11.2, 11.2, 11.2 }
};
static const eqz_preset_t eqz_preset_ska_10b=
{
"ska", 10, 6.0,
{ -2.4, -4.8, -4, -1.11022e-15, 4, 5.6, 8.8, 9.6, 11.2, 9.6 }
};
static const eqz_preset_t eqz_preset_soft_10b=
{
"soft", 10, 5.0,
{ 4.8, 1.6, -1.11022e-15, -2.4, -1.11022e-15, 4, 8, 9.6, 11.2, 12 }
};
static const eqz_preset_t eqz_preset_softrock_10b=
{
"softrock", 10, 7.0,
{ 4, 4, 2.4, -1.11022e-15, -4, -5.6, -3.2, -1.11022e-15, 2.4, 8.8 }
};
static const eqz_preset_t eqz_preset_techno_10b=
{
"techno", 10, 5.0,
{ 8, 5.6, -1.11022e-15, -5.6, -4.8, -1.11022e-15, 8, 9.6, 9.6, 8.8 }
};
static const eqz_preset_t *eqz_preset_10b[] =
{
&eqz_preset_flat_10b,
&eqz_preset_classical_10b,
&eqz_preset_club_10b,
&eqz_preset_dance_10b,
&eqz_preset_fullbass_10b,
&eqz_preset_fullbasstreble_10b,
&eqz_preset_fulltreble_10b,
&eqz_preset_headphones_10b,
&eqz_preset_largehall_10b,
&eqz_preset_live_10b,
&eqz_preset_party_10b,
&eqz_preset_pop_10b,
&eqz_preset_reggae_10b,
&eqz_preset_rock_10b,
&eqz_preset_ska_10b,
&eqz_preset_soft_10b,
&eqz_preset_softrock_10b,
&eqz_preset_techno_10b,
NULL
};
static inline float EqzConvertdB( float db )
{
/* Map it to gain,
......
modules/audio_filter/equalizer_presets.h 0 → 100644
View file @ 9ceb12b9
/*****************************************************************************
* equalizer_presets.h:
*****************************************************************************
* Copyright (C) 2004 VideoLAN
* $Id:$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/*****************************************************************************
* Equalizer presets
*****************************************************************************/
/* Equalizer presets values are in this file instead of equalizer.c, so you can
* get these values even if the equalizer is not enabled.
*/
#define EQZ_BANDS_MAX 10
static char *preset_list[] = {
"flat", "classical", "club", "dance", "fullbass", "fullbasstreble",
"fulltreble", "headphones","largehall", "live", "party", "pop", "reggae",
"rock", "ska", "soft", "softrock", "techno"
};
static char *preset_list_text[] = {
N_("Flat"), N_("Classical"), N_("Club"), N_("Dance"), N_("Full bass"),
N_("Full bass and treble"), N_("Full treble"), N_("Headphones"),
N_("Large Hall"), N_("Live"), N_("Party"), N_("Pop"), N_("Reggae"),
N_("Rock"), N_("Ska"), N_("Soft"), N_("Soft rock"), N_("Techno"),
};
typedef struct
{
char *psz_name;
int i_band;
float f_preamp;
float f_amp[EQZ_BANDS_MAX];
} eqz_preset_t;
static const eqz_preset_t eqz_preset_flat_10b=
{
"flat", 10, 12.0,
{ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 },
};
static const eqz_preset_t eqz_preset_classical_10b=
{
"classical", 10, 12.0,
{ -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, -7.2, -7.2, -7.2, -9.6 }
};
static const eqz_preset_t eqz_preset_club_10b=
{
"club", 10, 6.0,
{ -1.11022e-15, -1.11022e-15, 8, 5.6, 5.6, 5.6, 3.2, -1.11022e-15, -1.11022e-15, -1.11022e-15 }
};
static const eqz_preset_t eqz_preset_dance_10b=
{
"dance", 10, 5.0,
{ 9.6, 7.2, 2.4, -1.11022e-15, -1.11022e-15, -5.6, -7.2, -7.2, -1.11022e-15, -1.11022e-15 }
};
static const eqz_preset_t eqz_preset_fullbass_10b=
{
"fullbass", 10, 5.0,
{ -8, 9.6, 9.6, 5.6, 1.6, -4, -8, -10.4, -11.2, -11.2 }
};
static const eqz_preset_t eqz_preset_fullbasstreble_10b=
{
"fullbasstreble", 10, 4.0,
{ 7.2, 5.6, -1.11022e-15, -7.2, -4.8, 1.6, 8, 11.2, 12, 12 }
};
static const eqz_preset_t eqz_preset_fulltreble_10b=
{
"fulltreble", 10, 3.0,
{ -9.6, -9.6, -9.6, -4, 2.4, 11.2, 16, 16, 16, 16.8 }
};
static const eqz_preset_t eqz_preset_headphones_10b=
{
"headphones", 10, 4.0,
{ 4.8, 11.2, 5.6, -3.2, -2.4, 1.6, 4.8, 9.6, 12.8, 14.4 }
};
static const eqz_preset_t eqz_preset_largehall_10b=
{
"largehall", 10, 5.0,
{ 10.4, 10.4, 5.6, 5.6, -1.11022e-15, -4.8, -4.8, -4.8, -1.11022e-15, -1.11022e-15 }
};
static const eqz_preset_t eqz_preset_live_10b=
{
"live", 10, 7.0,
{ -4.8, -1.11022e-15, 4, 5.6, 5.6, 5.6, 4, 2.4, 2.4, 2.4 }
};
static const eqz_preset_t eqz_preset_party_10b=
{
"party", 10, 6.0,
{ 7.2, 7.2, -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, -1.11022e-15, 7.2, 7.2 }
};
static const eqz_preset_t eqz_preset_pop_10b=
{
"pop", 10, 6.0,
{ -1.6, 4.8, 7.2, 8, 5.6, -1.11022e-15, -2.4, -2.4, -1.6, -1.6 }
};
static const eqz_preset_t eqz_preset_reggae_10b=
{
"reggae", 10, 8.0,
{ -1.11022e-15, -1.11022e-15, -1.11022e-15, -5.6, -1.11022e-15, 6.4, 6.4, -1.11022e-15, -1.11022e-15, -1.11022e-15 }
};
static const eqz_preset_t eqz_preset_rock_10b=
{
"rock", 10, 5.0,
{ 8, 4.8, -5.6, -8, -3.2, 4, 8.8, 11.2, 11.2, 11.2 }
};
static const eqz_preset_t eqz_preset_ska_10b=
{
"ska", 10, 6.0,
{ -2.4, -4.8, -4, -1.11022e-15, 4, 5.6, 8.8, 9.6, 11.2, 9.6 }
};
static const eqz_preset_t eqz_preset_soft_10b=
{
"soft", 10, 5.0,
{ 4.8, 1.6, -1.11022e-15, -2.4, -1.11022e-15, 4, 8, 9.6, 11.2, 12 }
};
static const eqz_preset_t eqz_preset_softrock_10b=
{
"softrock", 10, 7.0,
{ 4, 4, 2.4, -1.11022e-15, -4, -5.6, -3.2, -1.11022e-15, 2.4, 8.8 }
};
static const eqz_preset_t eqz_preset_techno_10b=
{
"techno", 10, 5.0,
{ 8, 5.6, -1.11022e-15, -5.6, -4.8, -1.11022e-15, 8, 9.6, 9.6, 8.8 }
};
static const eqz_preset_t *eqz_preset_10b[] =
{
&eqz_preset_flat_10b,
&eqz_preset_classical_10b,
&eqz_preset_club_10b,
&eqz_preset_dance_10b,
&eqz_preset_fullbass_10b,
&eqz_preset_fullbasstreble_10b,
&eqz_preset_fulltreble_10b,
&eqz_preset_headphones_10b,
&eqz_preset_largehall_10b,
&eqz_preset_live_10b,
&eqz_preset_party_10b,
&eqz_preset_pop_10b,
&eqz_preset_reggae_10b,
&eqz_preset_rock_10b,
&eqz_preset_ska_10b,
&eqz_preset_soft_10b,
&eqz_preset_softrock_10b,
&eqz_preset_techno_10b,
NULL
};
modules/gui/macosx/equalizer.h
View file @ 9ceb12b9
......@@ -2,7 +2,7 @@
* equalizer.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2004 VideoLAN
* $Id: equalizer.h 1 2004-08-07 23:51:00Z djc $
* $Id$
*
* Authors: JŽr™me Decoodt <djc@videolan.org>
*
......@@ -26,9 +26,10 @@
*****************************************************************************/
@interface VLCEqualizer : NSObject
{
IBOutlet id o_btn_2pass;
IBOutlet id o_btn_enable;
IBOutlet id o_btn_equalizer;
IBOutlet id o_ckb_2pass;
IBOutlet id o_ckb_enable;
IBOutlet id o_fld_preamp;
IBOutlet id o_popup_presets;
IBOutlet id o_slider_band1;
IBOutlet id o_slider_band10;
......@@ -43,10 +44,14 @@
IBOutlet id o_slider_preamp;
IBOutlet id o_window;
}
- (void)initStrings;
- (void)equalizerUpdated;
- (IBAction)bandSliderUpdated:(id)sender;
- (IBAction)changePreset:(id)sender;
- (IBAction)enable:(id)sender;
- (IBAction)preampSliderUpdated:(id)sender;
- (IBAction)toggleWindow:(id)sender;
- (IBAction)twopass:(id)sender;
- (void)windowWillClose:(NSNotification *)aNotification;
- (void)awakeFromNib;
@end
modules/gui/macosx/equalizer.m
View file @ 9ceb12b9
This diff is collapsed.
modules/gui/macosx/intf.h
View file @ 9ceb12b9
......@@ -208,6 +208,7 @@ struct intf_sys_t
IBOutlet id o_mi_minimize;
IBOutlet id o_mi_close_window;
IBOutlet id o_mi_controller;
IBOutlet id o_mi_equalizer;
IBOutlet id o_mi_playlist;
IBOutlet id o_mi_info;
IBOutlet id o_mi_messages;
......
modules/gui/macosx/intf.m
View file @ 9ceb12b9
......@@ -469,6 +469,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_mi_minimize setTitle: _NS("Minimize Window")];
[o_mi_close_window setTitle: _NS("Close Window")];
[o_mi_controller setTitle: _NS("Controller")];
[o_mi_equalizer setTitle: _NS("Equalizer")];
[o_mi_playlist setTitle: _NS("Playlist")];
[o_mi_info setTitle: _NS("Info")];
[o_mi_messages setTitle: _NS("Messages")];
......@@ -941,7 +942,6 @@ static VLCMain *_o_sharedMainInstance = nil;
{
playlist_t *p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist != NULL )
{
#define p_input p_playlist->p_input
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment