Skip to content

V
vlc-2-2
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
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 @@ ...@@ -63,9 +63,10 @@
CLASS = VLCEqualizer; CLASS = VLCEqualizer;
LANGUAGE = ObjC; LANGUAGE = ObjC;
OUTLETS = { OUTLETS = {
"o_btn_2pass" = id;
"o_btn_enable" = id;
"o_btn_equalizer" = id; "o_btn_equalizer" = id;
"o_ckb_2pass" = id;
"o_ckb_enable" = id;
"o_fld_preamp" = id;
"o_popup_presets" = id; "o_popup_presets" = id;
"o_slider_band1" = id; "o_slider_band1" = id;
"o_slider_band10" = id; "o_slider_band10" = id;
...@@ -168,6 +169,7 @@ ...@@ -168,6 +169,7 @@
"o_mi_device" = id; "o_mi_device" = id;
"o_mi_documentation" = id; "o_mi_documentation" = id;
"o_mi_double_window" = id; "o_mi_double_window" = id;
"o_mi_equalizer" = id;
"o_mi_faster" = id; "o_mi_faster" = id;
"o_mi_fittoscreen" = id; "o_mi_fittoscreen" = id;
"o_mi_floatontop" = id; "o_mi_floatontop" = id;
......
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
View file @ 9ceb12b9
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
</array> </array>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>21</integer>
<integer>2029</integer>
<integer>29</integer> <integer>29</integer>
<integer>2029</integer>
<integer>21</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>7H63</string> <string>7M34</string>
</dict> </dict>
</plist> </plist>
modules/audio_filter/Modules.am
View file @ 9ceb12b9
SOURCES_equalizer = equalizer.c SOURCES_equalizer = equalizer.c equalizer.h
SOURCES_normvol = normvol.c SOURCES_normvol = normvol.c
modules/audio_filter/equalizer.c
View file @ 9ceb12b9
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <vlc/aout.h> #include <vlc/aout.h>
#include "aout_internal.h" #include "aout_internal.h"
#include "equalizer_presets.h"
/* TODO: /* TODO:
* - add tables for other rates ( 22500, 11250, ...) * - add tables for other rates ( 22500, 11250, ...)
* - optimize a bit (you can hardly do slower ;) * - optimize a bit (you can hardly do slower ;)
...@@ -60,18 +61,6 @@ static void Close( vlc_object_t * ); ...@@ -60,18 +61,6 @@ static void Close( vlc_object_t * );
#define PREAMP_TEXT N_("Global gain" ) #define PREAMP_TEXT N_("Global gain" )
#define PREAMP_LONGTEXT N_("Set the global gain in dB (-20 ... 20)" ) #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(); vlc_module_begin();
set_description( _("Equalizer 10 bands") ); set_description( _("Equalizer 10 bands") );
set_capability( "audio filter", 0 ); set_capability( "audio filter", 0 );
...@@ -91,7 +80,6 @@ vlc_module_end(); ...@@ -91,7 +80,6 @@ vlc_module_end();
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
#define EQZ_BANDS_MAX 10
typedef struct aout_filter_sys_t typedef struct aout_filter_sys_t
{ {
/* Filter static config */ /* Filter static config */
...@@ -248,130 +236,6 @@ static const eqz_config_t eqz_config_48000_10b = ...@@ -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 ) static inline float EqzConvertdB( float db )
{ {
/* Map it to gain, /* 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 @@ ...@@ -2,7 +2,7 @@
* equalizer.h: MacOS X interface module * equalizer.h: MacOS X interface module
***************************************************************************** *****************************************************************************
* Copyright (C) 2004 VideoLAN * Copyright (C) 2004 VideoLAN
* $Id: equalizer.h 1 2004-08-07 23:51:00Z djc $ * $Id$
* *
* Authors: JŽr™me Decoodt <djc@videolan.org> * Authors: JŽr™me Decoodt <djc@videolan.org>
* *
...@@ -26,9 +26,10 @@ ...@@ -26,9 +26,10 @@
*****************************************************************************/ *****************************************************************************/
@interface VLCEqualizer : NSObject @interface VLCEqualizer : NSObject
{ {
IBOutlet id o_btn_2pass;
IBOutlet id o_btn_enable;
IBOutlet id o_btn_equalizer; 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_popup_presets;
IBOutlet id o_slider_band1; IBOutlet id o_slider_band1;
IBOutlet id o_slider_band10; IBOutlet id o_slider_band10;
...@@ -43,10 +44,14 @@ ...@@ -43,10 +44,14 @@
IBOutlet id o_slider_preamp; IBOutlet id o_slider_preamp;
IBOutlet id o_window; IBOutlet id o_window;
} }
- (void)initStrings;
- (void)equalizerUpdated;
- (IBAction)bandSliderUpdated:(id)sender; - (IBAction)bandSliderUpdated:(id)sender;
- (IBAction)changePreset:(id)sender; - (IBAction)changePreset:(id)sender;
- (IBAction)enable:(id)sender; - (IBAction)enable:(id)sender;
- (IBAction)preampSliderUpdated:(id)sender; - (IBAction)preampSliderUpdated:(id)sender;
- (IBAction)toggleWindow:(id)sender; - (IBAction)toggleWindow:(id)sender;
- (IBAction)twopass:(id)sender; - (IBAction)twopass:(id)sender;
- (void)windowWillClose:(NSNotification *)aNotification;
- (void)awakeFromNib;
@end @end
modules/gui/macosx/equalizer.m
View file @ 9ceb12b9
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright (C) 2004 VideoLAN * Copyright (C) 2004 VideoLAN
* $Id$ * $Id$
* *
* Authors: Jrme Decoodt <djc@videolan.org> * Authors: Jerome Decoodt <djc@videolan.org>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
...@@ -33,24 +33,24 @@ ...@@ -33,24 +33,24 @@
#include <math.h> #include <math.h>
#include "equalizer.h" #include "equalizer.h"
#include "../../audio_filter/equalizer_presets.h"
/***************************************************************************** /*****************************************************************************
* VLCEqualizer implementation * VLCEqualizer implementation
*****************************************************************************/ *****************************************************************************/
@implementation VLCEqualizer @implementation VLCEqualizer
static void ChangeFiltersString( playlist_t *p_playlist, static void ChangeFiltersString( intf_thread_t *p_intf,
aout_instance_t *p_aout,
char *psz_name, vlc_bool_t b_add ) char *psz_name, vlc_bool_t b_add )
{ {
char *psz_parser, *psz_string; char *psz_parser, *psz_string;
vlc_object_t *p_object = NULL;
int i; int i;
vlc_object_t *p_object = vlc_object_find( p_intf,
if( p_playlist != NULL ) VLC_OBJECT_AOUT, FIND_ANYWHERE );
p_object = ( vlc_object_t* )p_playlist; aout_instance_t *p_aout = (aout_instance_t *)p_object;
if( p_aout != NULL ) if( p_object == NULL )
p_object = ( vlc_object_t* )p_aout; p_object = vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_object == NULL ) if( p_object == NULL )
return; return;
...@@ -103,25 +103,24 @@ static void ChangeFiltersString( playlist_t *p_playlist, ...@@ -103,25 +103,24 @@ static void ChangeFiltersString( playlist_t *p_playlist,
} }
} }
free( psz_string ); free( psz_string );
vlc_object_release( p_object );
} }
static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist, static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
aout_instance_t *p_aout,
char *psz_name ) char *psz_name )
{ {
char *psz_parser, *psz_string; char *psz_parser, *psz_string;
vlc_object_t *p_object = NULL; vlc_object_t *p_object = vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_playlist != NULL ) if( p_object == NULL )
p_object = ( vlc_object_t* )p_playlist; p_object = vlc_object_find( p_intf,
if( p_aout != NULL ) VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
p_object = ( vlc_object_t* )p_aout;
if( p_object == NULL ) if( p_object == NULL )
return VLC_FALSE; return VLC_FALSE;
psz_string = var_GetString( p_object, "audio-filter" ); psz_string = var_GetString( p_object, "audio-filter" );
if( !psz_string ) psz_string = strdup(""); if( !psz_string ) return VLC_FALSE;
psz_parser = strstr( psz_string, psz_name ); psz_parser = strstr( psz_string, psz_name );
...@@ -133,81 +132,65 @@ static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist, ...@@ -133,81 +132,65 @@ static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist,
return VLC_FALSE; return VLC_FALSE;
} }
- (IBAction)bandSliderUpdated:(id)sender - (void)initStrings
{ {
intf_thread_t *p_intf = VLCIntf; int i;
aout_instance_t *p_aout = ( aout_instance_t * )vlc_object_find( p_intf, [o_btn_equalizer setToolTip: _NS("Equalizer")];
VLC_OBJECT_AOUT, FIND_ANYWHERE ); [o_ckb_2pass setTitle: _NS("2 Pass")];
playlist_t *p_playlist = ( playlist_t * )vlc_object_find( p_intf, [o_ckb_2pass setToolTip: _NS("If you enable this settting, the "
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); "equalizer filter will be applied twice. The effect will be sharper")];
vlc_object_t *p_object = NULL; [o_ckb_enable setTitle: _NS("Enable")];
[o_ckb_enable setToolTip: _NS("Enable the equalizer. You can either "
char psz_values[102]; "manually change the bands or use a preset.")];
memset( psz_values, 0, 102 ); [o_fld_preamp setStringValue: _NS("Preamp")];
if( p_playlist != NULL ) [o_popup_presets removeAllItems];
p_object = ( vlc_object_t* )p_playlist; for( i = 0; i < 18 ; i++ )
if( p_aout != NULL ) {
p_object = ( vlc_object_t* )p_aout; [o_popup_presets insertItemWithTitle: _NS(preset_list[i]) atIndex: i];
if( p_object == NULL ) }
return; [o_window setTitle: _NS("Equalizer")];
/* Write the new bands values */ [o_slider_band1 setFloatValue: 0];
/* TODO: write a generic code instead of ten times the same thing */ [o_slider_band2 setFloatValue: 0];
[o_slider_band3 setFloatValue: 0];
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band1 floatValue] ); [o_slider_band4 setFloatValue: 0];
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band2 floatValue] ); [o_slider_band5 setFloatValue: 0];
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band3 floatValue] ); [o_slider_band6 setFloatValue: 0];
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band4 floatValue] ); [o_slider_band7 setFloatValue: 0];
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band5 floatValue] ); [o_slider_band8 setFloatValue: 0];
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band6 floatValue] ); [o_slider_band9 setFloatValue: 0];
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band7 floatValue] ); [o_slider_band10 setFloatValue: 0];
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band8 floatValue] );
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band9 floatValue] ); [o_ckb_enable setState: NSOffState];
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band10 floatValue] ); [o_ckb_2pass setState: NSOffState];
var_SetString( p_object, "equalizer-bands", psz_values );
if( p_aout )
vlc_object_release( p_aout );
if( p_playlist )
vlc_object_release( p_playlist );
} }
- (IBAction)changePreset:(id)sender - (void)equalizerUpdated
{ {
intf_thread_t *p_intf = VLCIntf; intf_thread_t *p_intf = VLCIntf;
float f_preamp, f_band[10]; float f_preamp, f_band[10];
char *psz_bands, *p_next; char *psz_bands, *p_next;
vlc_bool_t b_2p; vlc_bool_t b_2p;
int i; int i;
aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf, vlc_bool_t b_enabled = GetFiltersStatus( p_intf, "equalizer" );
vlc_object_t *p_object = vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE ); VLC_OBJECT_AOUT, FIND_ANYWHERE );
playlist_t *p_playlist = ( playlist_t * )vlc_object_find( p_intf, if( p_object == NULL )
p_object = vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
vlc_object_t *p_object = NULL;
vlc_bool_t b_enabled = GetFiltersStatus( p_playlist, p_aout, "equalizer" );
static char *preset_list[] = {
"flat", "classical", "club", "dance", "fullbass", "fullbasstreble",
"fulltreble", "headphones","largehall", "live", "party", "pop", "reggae",
"rock", "ska", "soft", "softrock", "techno"
};
if( p_playlist != NULL )
p_object = ( vlc_object_t* )p_playlist;
if( p_aout != NULL )
p_object = ( vlc_object_t* )p_aout;
if( p_object == NULL ) if( p_object == NULL )
{
msg_Dbg( p_intf, "equalizer settings not set: no playlist nor aout found");
return; return;
}
var_SetString( p_object , "equalizer-preset" , preset_list[[sender indexOfSelectedItem]] );
f_preamp = var_GetFloat( p_object, "equalizer-preamp" ); f_preamp = var_GetFloat( p_object, "equalizer-preamp" );
psz_bands = var_GetString( p_object, "equalizer-bands" ); psz_bands = var_GetString( p_object, "equalizer-bands" );
if( !psz_bands )
psz_bands = strdup( "0 0 0 0 0 0 0 0 0 0" );
if ( !psz_bands )
return;
b_2p = var_GetBool( p_object, "equalizer-2pass" ); b_2p = var_GetBool( p_object, "equalizer-2pass" );
vlc_object_release( p_object ); vlc_object_release( p_object );
/* Set the preamp slider */ /* Set the preamp slider */
...@@ -227,6 +210,8 @@ static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist, ...@@ -227,6 +210,8 @@ static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist,
if( !*psz_bands ) break; /* end of line */ if( !*psz_bands ) break; /* end of line */
psz_bands = p_next+1; psz_bands = p_next+1;
} }
free( psz_bands );
[o_slider_band1 setFloatValue: f_band[0]]; [o_slider_band1 setFloatValue: f_band[0]];
[o_slider_band2 setFloatValue: f_band[1]]; [o_slider_band2 setFloatValue: f_band[1]];
[o_slider_band3 setFloatValue: f_band[2]]; [o_slider_band3 setFloatValue: f_band[2]];
...@@ -238,140 +223,115 @@ static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist, ...@@ -238,140 +223,115 @@ static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist,
[o_slider_band9 setFloatValue: f_band[8]]; [o_slider_band9 setFloatValue: f_band[8]];
[o_slider_band10 setFloatValue: f_band[9]]; [o_slider_band10 setFloatValue: f_band[9]];
/* Set the the checkboxes */
if( b_enabled == VLC_TRUE ) if( b_enabled == VLC_TRUE )
[o_btn_enable setState:NSOnState]; [o_ckb_enable setState:NSOnState];
else else
[o_btn_enable setState:NSOffState]; [o_ckb_enable setState:NSOffState];
[o_btn_2pass setState:( ( b_2p == VLC_TRUE ) ? NSOnState : NSOffState )]; [o_ckb_2pass setState:( ( b_2p == VLC_TRUE ) ? NSOnState : NSOffState )];
} }
- (IBAction)enable:(id)sender - (IBAction)bandSliderUpdated:(id)sender
{ {
intf_thread_t *p_intf = VLCIntf; intf_thread_t *p_intf = VLCIntf;
aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find( p_intf, vlc_object_t *p_object = vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE ); VLC_OBJECT_AOUT, FIND_ANYWHERE );
playlist_t *p_playlist = ( playlist_t * )vlc_object_find( p_intf, char psz_values[102];
memset( psz_values, 0, 102 );
if( p_object == NULL )
p_object = vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
ChangeFiltersString( p_playlist, p_aout, "equalizer", [sender state] ); if( p_object == NULL )
return;
/* Write the new bands values */
/* TODO: write a generic code instead of ten times the same thing */
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band1 floatValue] );
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band2 floatValue] );
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band3 floatValue] );
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band4 floatValue] );
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band5 floatValue] );
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band6 floatValue] );
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band7 floatValue] );
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band8 floatValue] );
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band9 floatValue] );
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band10 floatValue] );
[o_popup_presets setEnabled: [sender state]]; var_SetString( p_object, "equalizer-bands", psz_values );
if( p_aout != NULL ) vlc_object_release( p_object );
vlc_object_release( p_aout );
if( p_playlist != NULL )
vlc_object_release( p_playlist );
} }
- (IBAction)preampSliderUpdated:(id)sender - (IBAction)changePreset:(id)sender
{ {
intf_thread_t *p_intf = VLCIntf; intf_thread_t *p_intf = VLCIntf;
float f_preamp= [sender floatValue] ; int i;
vlc_object_t *p_object= vlc_object_find( p_intf,
aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE ); VLC_OBJECT_AOUT, FIND_ANYWHERE );
playlist_t *p_playlist = ( playlist_t * )vlc_object_find( p_intf, char psz_values[102];
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); memset( psz_values, 0, 102 );
vlc_object_t *p_object = NULL;
if( p_playlist != NULL )
p_object = ( vlc_object_t* )p_playlist;
if( p_aout != NULL )
p_object = ( vlc_object_t* )p_aout;
if( p_object == NULL ) if( p_object == NULL )
{ p_object = vlc_object_find( p_intf,
msg_Dbg( p_intf, "equalizer settings not set: no playlist nor aout found"); VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_object == NULL )
return; return;
}
var_SetFloat( p_object, "equalizer-preamp", f_preamp ); var_SetString( p_object , "equalizer-preset" , preset_list[[sender indexOfSelectedItem]] );
if( p_aout != NULL ) for( i = 0; i < 10; i++ )
vlc_object_release( p_aout ); sprintf( psz_values, "%s %.1f", psz_values, eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[i] );
if( p_playlist != NULL ) var_SetString( p_object, "equalizer-bands", psz_values );
vlc_object_release( p_playlist );
[o_slider_preamp setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_preamp];
[o_slider_band1 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[0]];
[o_slider_band2 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[1]];
[o_slider_band3 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[2]];
[o_slider_band4 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[3]];
[o_slider_band5 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[4]];
[o_slider_band6 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[5]];
[o_slider_band7 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[6]];
[o_slider_band8 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[7]];
[o_slider_band9 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[8]];
[o_slider_band10 setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[9]];
vlc_object_release( p_object );
} }
- (IBAction)toggleWindow:(id)sender - (IBAction)enable:(id)sender
{
ChangeFiltersString( VLCIntf, "equalizer", [sender state] );
}
- (IBAction)preampSliderUpdated:(id)sender
{ {
if( [o_window isVisible] )
{
[o_window orderOut:sender];
[o_btn_equalizer setState:NSOffState];
}
else
{
intf_thread_t *p_intf = VLCIntf; intf_thread_t *p_intf = VLCIntf;
float f_preamp, f_band[10]; float f_preamp = [sender floatValue] ;
char *psz_bands, *p_next;
vlc_bool_t b_2p; vlc_object_t *p_object = vlc_object_find( p_intf,
int i;
aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE ); VLC_OBJECT_AOUT, FIND_ANYWHERE );
playlist_t *p_playlist = ( playlist_t * )vlc_object_find( p_intf, if( p_object == NULL )
p_object = vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
vlc_object_t *p_object = NULL;
vlc_bool_t b_enabled = GetFiltersStatus( p_playlist, p_aout, "equalizer" );
if( p_playlist != NULL )
p_object = ( vlc_object_t* )p_playlist;
if( p_aout != NULL )
p_object = ( vlc_object_t* )p_aout;
if( p_object == NULL ) if( p_object == NULL )
{
msg_Dbg( p_intf, "equalizer settings not set: no playlist nor aout found");
return; return;
}
f_preamp = var_GetFloat( p_object, "equalizer-preamp" );
psz_bands = var_GetString( p_object, "equalizer-bands" );
b_2p = var_GetBool( p_object, "equalizer-2pass" );
if( p_aout != NULL ) var_SetFloat( p_object, "equalizer-preamp", f_preamp );
vlc_object_release( p_aout );
if( p_playlist != NULL )
vlc_object_release( p_playlist );
if( !psz_bands )
psz_bands = "0 0 0 0 0 0 0 0 0 0";
/* Set the preamp slider */ vlc_object_release( p_object );
[o_slider_preamp setFloatValue: f_preamp]; }
/* Set the bands slider */ - (IBAction)toggleWindow:(id)sender
for( i = 0; i < 10; i++ ) {
if( [o_window isVisible] )
{ {
/* Read dB -20/20 */ [o_window orderOut:sender];
#ifdef HAVE_STRTOF [o_btn_equalizer setState:NSOffState];
f_band[i] = strtof( psz_bands, &p_next );
#else
f_band[i] = (float)strtod( psz_bands, &p_next );
#endif
if( !p_next || p_next == psz_bands ) break; /* strtof() failed */
if( !*psz_bands ) break; /* end of line */
psz_bands = p_next+1;
} }
[o_slider_band1 setFloatValue: f_band[0]];
[o_slider_band2 setFloatValue: f_band[1]];
[o_slider_band3 setFloatValue: f_band[2]];
[o_slider_band4 setFloatValue: f_band[3]];
[o_slider_band5 setFloatValue: f_band[4]];
[o_slider_band6 setFloatValue: f_band[5]];
[o_slider_band7 setFloatValue: f_band[6]];
[o_slider_band8 setFloatValue: f_band[7]];
[o_slider_band9 setFloatValue: f_band[8]];
[o_slider_band10 setFloatValue: f_band[9]];
if( b_enabled == VLC_TRUE )
[o_btn_enable setState:NSOnState];
else else
[o_btn_enable setState:NSOffState]; {
[o_btn_2pass setState:( ( b_2p == VLC_TRUE ) ? NSOnState : NSOffState )];
[o_window makeKeyAndOrderFront:sender]; [o_window makeKeyAndOrderFront:sender];
[o_btn_equalizer setState:NSOnState]; [o_btn_equalizer setState:NSOnState];
} }
...@@ -380,26 +340,18 @@ static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist, ...@@ -380,26 +340,18 @@ static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist,
- (IBAction)twopass:(id)sender - (IBAction)twopass:(id)sender
{ {
intf_thread_t *p_intf = VLCIntf; intf_thread_t *p_intf = VLCIntf;
aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf, vlc_bool_t b_2p = [sender state] ? VLC_TRUE : VLC_FALSE;
vlc_object_t *p_object= vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE ); VLC_OBJECT_AOUT, FIND_ANYWHERE );
playlist_t *p_playlist = ( playlist_t * )vlc_object_find( p_intf, aout_instance_t *p_aout = (aout_instance_t *)p_object;
if( p_object == NULL )
p_object = vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
vlc_object_t *p_object = NULL;
vlc_bool_t b_2p = [sender state] ? VLC_TRUE : VLC_FALSE;
if( p_playlist != NULL )
p_object = ( vlc_object_t* )p_playlist;
if( p_aout != NULL )
p_object = ( vlc_object_t* )p_aout;
if( p_object == NULL ) if( p_object == NULL )
{
msg_Dbg( p_intf, "equalizer settings not set: no playlist nor aout found");
return; return;
}
var_SetBool( p_object, "equalizer-2pass", b_2p ); var_SetBool( p_object, "equalizer-2pass", b_2p );
if( ( [o_btn_enable state] ) && ( p_aout != NULL ) ) if( ( [o_ckb_enable state] ) && ( p_aout != NULL ) )
{ {
int i; int i;
for( i = 0; i < p_aout->i_nb_inputs; i++ ) for( i = 0; i < p_aout->i_nb_inputs; i++ )
...@@ -408,10 +360,20 @@ static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist, ...@@ -408,10 +360,20 @@ static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist,
} }
} }
if( p_aout != NULL ) vlc_object_release( p_object );
vlc_object_release( p_aout ); }
if( p_playlist != NULL )
vlc_object_release( p_playlist ); - (void)windowWillClose:(NSNotification *)aNotification
{
[o_btn_equalizer setState: NSOffState];
}
- (void)awakeFromNib
{
[o_window setExcludedFromWindowsMenu: TRUE];
[self initStrings];
[self equalizerUpdated];
} }
@end @end
modules/gui/macosx/intf.h
View file @ 9ceb12b9
...@@ -208,6 +208,7 @@ struct intf_sys_t ...@@ -208,6 +208,7 @@ struct intf_sys_t
IBOutlet id o_mi_minimize; IBOutlet id o_mi_minimize;
IBOutlet id o_mi_close_window; IBOutlet id o_mi_close_window;
IBOutlet id o_mi_controller; IBOutlet id o_mi_controller;
IBOutlet id o_mi_equalizer;
IBOutlet id o_mi_playlist; IBOutlet id o_mi_playlist;
IBOutlet id o_mi_info; IBOutlet id o_mi_info;
IBOutlet id o_mi_messages; IBOutlet id o_mi_messages;
......
modules/gui/macosx/intf.m
View file @ 9ceb12b9
...@@ -469,6 +469,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -469,6 +469,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_mi_minimize setTitle: _NS("Minimize Window")]; [o_mi_minimize setTitle: _NS("Minimize Window")];
[o_mi_close_window setTitle: _NS("Close Window")]; [o_mi_close_window setTitle: _NS("Close Window")];
[o_mi_controller setTitle: _NS("Controller")]; [o_mi_controller setTitle: _NS("Controller")];
[o_mi_equalizer setTitle: _NS("Equalizer")];
[o_mi_playlist setTitle: _NS("Playlist")]; [o_mi_playlist setTitle: _NS("Playlist")];
[o_mi_info setTitle: _NS("Info")]; [o_mi_info setTitle: _NS("Info")];
[o_mi_messages setTitle: _NS("Messages")]; [o_mi_messages setTitle: _NS("Messages")];
...@@ -941,7 +942,6 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -941,7 +942,6 @@ static VLCMain *_o_sharedMainInstance = nil;
{ {
playlist_t *p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, playlist_t *p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE ); FIND_ANYWHERE );
if( p_playlist != NULL ) if( p_playlist != NULL )
{ {
#define p_input p_playlist->p_input #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