Skip to content

V
vlc-2-2
Commit 0fb77aee authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: removed no longer needed equalizer class

parent b2d8179b
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 538 deletions
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ 0fb77aee
......@@ -480,6 +480,7 @@
CCD590F110E5B73200D39094 /* dialogProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = dialogProvider.m; path = ../../../modules/gui/macosx_dialog_provider/dialogProvider.m; sourceTree = SOURCE_ROOT; };
CCD590F210E5B76300D39094 /* VLCLoginPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCLoginPanel.h; path = ../../../modules/gui/macosx_dialog_provider/VLCLoginPanel.h; sourceTree = SOURCE_ROOT; };
CCD590F310E5B76300D39094 /* VLCLoginPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCLoginPanel.m; path = ../../../modules/gui/macosx_dialog_provider/VLCLoginPanel.m; sourceTree = SOURCE_ROOT; };
CCDBA3B313D32E200006127B /* macosx.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = macosx.m; path = ../../../modules/video_output/macosx.m; sourceTree = "<group>"; };
CCF0777913659A8000AF19FD /* SPInvocationGrabbing.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPInvocationGrabbing.h; path = ../../../modules/gui/macosx/SPInvocationGrabbing.h; sourceTree = "<group>"; };
CCF0777A13659A8000AF19FD /* SPInvocationGrabbing.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SPInvocationGrabbing.m; path = ../../../modules/gui/macosx/SPInvocationGrabbing.m; sourceTree = "<group>"; };
CCF0777B13659A8000AF19FD /* SPMediaKeyTap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPMediaKeyTap.h; path = ../../../modules/gui/macosx/SPMediaKeyTap.h; sourceTree = "<group>"; };
......@@ -871,6 +872,7 @@
CC6C01BA0DDF3EEC00C7D754 /* auhal.c */,
CCC895830D9A8A82005AE59C /* eyetv.m */,
CC9E3E7913D1CFCF00429A71 /* qtcapture.m */,
CCDBA3B313D32E200006127B /* macosx.m */,
);
name = "OSX-specific source files";
sourceTree = "<group>";
......
modules/gui/macosx/Modules.am
View file @ 0fb77aee
......@@ -22,8 +22,6 @@ SOURCES_macosx = \
applescript.m \
controls.h \
controls.m \
equalizer.m \
equalizer.h \
coredialogs.m \
coredialogs.h \
intf.m \
......
modules/gui/macosx/equalizer.h deleted 100644 → 0
View file @ b2d8179b
/*****************************************************************************
* equalizer.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2004-2008 the VideoLAN team
* $Id$
*
* Authors: Jérôme Decoodt <djc@videolan.org>
*
* 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* VLCEqualizer interface
*****************************************************************************/
@interface VLCEqualizer : NSObject
{
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;
IBOutlet id o_slider_band2;
IBOutlet id o_slider_band3;
IBOutlet id o_slider_band4;
IBOutlet id o_slider_band5;
IBOutlet id o_slider_band6;
IBOutlet id o_slider_band7;
IBOutlet id o_slider_band8;
IBOutlet id o_slider_band9;
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;
- (void)setValue: (float)value forSlider: (int)index;
- (id)sliderByIndex: (int)index;
- (void)setBandSlidersValues: (float *)values;
- (void)initBandSliders;
@end
modules/gui/macosx/equalizer.m deleted 100644 → 0
View file @ b2d8179b
/*****************************************************************************
* equalizer.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2004-2008 the VideoLAN team
* $Id$
*
* Authors: Jérôme Decoodt <djc@videolan.org>
* Felix Paul Kühne <fkuehne -at- videolan -dot- org>
*
* 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_aout.h>
#include "intf.h"
#include <math.h>
#include "equalizer.h"
#include "../../audio_filter/equalizer_presets.h"
/*****************************************************************************
* VLCEqualizer implementation
*****************************************************************************/
@implementation VLCEqualizer
static void ChangeFiltersString( intf_thread_t *p_intf,
char *psz_name, bool b_add )
{
char *psz_parser, *psz_string;
int i;
aout_instance_t *p_aout = getAout();
vlc_object_t *p_object = VLC_OBJECT(p_aout);
if( !p_object )
{
p_object = vlc_object_hold(pl_Get( p_intf ));
}
psz_string = var_GetNonEmptyString( p_object, "audio-filter" );
if( !psz_string ) psz_string = strdup( "" );
psz_parser = strstr( psz_string, psz_name );
if( b_add )
{
if( !psz_parser )
{
psz_parser = psz_string;
asprintf( &psz_string, ( *psz_string ) ? "%s,%s" : "%s%s",
psz_string, psz_name );
free( psz_parser );
}
else
{
vlc_object_release( p_object );
return;
}
}
else
{
if( psz_parser )
{
memmove( psz_parser, psz_parser + strlen( psz_name ) +
( *( psz_parser + strlen( psz_name ) ) == ',' ? 1 : 0 ),
strlen( psz_parser + strlen( psz_name ) ) + 1 );
if( *( psz_string+strlen( psz_string ) - 1 ) == ',' )
{
*( psz_string+strlen( psz_string ) - 1 ) = '\0';
}
}
else
{
free( psz_string );
vlc_object_release( p_object );
return;
}
}
aout_EnableFilter( pl_Get( p_intf ), psz_string, b_add);
if( (BOOL)config_GetInt( p_object, "macosx-eq-keep" ) == YES )
{
/* save changed to config */
config_PutPsz( p_object, "audio-filter", psz_string );
}
free( psz_string );
vlc_object_release( p_object );
}
static bool GetFiltersStatus( intf_thread_t *p_intf,
char *psz_name )
{
char *psz_parser, *psz_string = NULL;
vlc_object_t *p_object = VLC_OBJECT(getAout());
if( p_object == NULL )
p_object = vlc_object_hold(pl_Get( p_intf ));
if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES )
psz_string = config_GetPsz( p_intf, "audio-filter" );
if(! psz_string )
psz_string = var_GetNonEmptyString( p_object, "audio-filter" );
vlc_object_release( p_object );
if( !psz_string ) return false;
psz_parser = strstr( psz_string, psz_name );
free( psz_string );
if ( psz_parser )
return true;
else
return false;
}
- (void)initStrings
{
int i;
[o_btn_equalizer setToolTip: _NS("Equalizer")];
[o_ckb_2pass setTitle: _NS("2 Pass")];
[o_ckb_2pass setToolTip: _NS("Apply the "
"equalizer filter twice. The effect will be sharper.")];
[o_ckb_enable setTitle: _NS("Enable")];
[o_ckb_enable setToolTip: _NS("Enable the equalizer. Bands can be set "
"manually or using a preset.")];
[o_fld_preamp setStringValue: _NS("Preamp")];
[o_popup_presets removeAllItems];
for( i = 0; i < 18 ; i++ )
{
[o_popup_presets insertItemWithTitle: _NS(preset_list_text[i]) atIndex: i];
}
[o_window setTitle: _NS("Equalizer")];
[self initBandSliders];
}
- (void)equalizerUpdated
{
intf_thread_t *p_intf = VLCIntf;
float f_preamp, f_band[10];
char *psz_bands, *psz_bands_init, *p_next;
bool b_2p;
int i;
bool b_enabled = GetFiltersStatus( p_intf, (char *)"equalizer" );
vlc_object_t *p_object = VLC_OBJECT(getAout());
if( p_object == NULL )
p_object = vlc_object_hold(pl_Get( p_intf ));
var_Create( p_object, "equalizer-preamp", VLC_VAR_FLOAT |
VLC_VAR_DOINHERIT );
var_Create( p_object, "equalizer-bands", VLC_VAR_STRING |
VLC_VAR_DOINHERIT );
psz_bands = var_GetNonEmptyString( p_object, "equalizer-bands" );
if( psz_bands == NULL )
psz_bands = strdup( "0 0 0 0 0 0 0 0 0 0" );
if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES )
{
b_2p = (BOOL)config_GetInt( p_object, "equalizer-2pass" );
f_preamp = config_GetFloat( p_object, "equalizer-preamp" );
}
else
{
b_2p = var_GetBool( p_object, "equalizer-2pass" );
f_preamp = var_GetFloat( p_object, "equalizer-preamp" );
}
vlc_object_release( p_object );
/* Set the preamp slider */
[o_slider_preamp setFloatValue: f_preamp];
/* Set the bands slider */
psz_bands_init = psz_bands;
for( i = 0; i < 10; i++ )
{
/* Read dB -20/20 */
f_band[i] = strtof( psz_bands, &p_next );
if( !p_next || p_next == psz_bands ) break; /* strtof() failed */
if( !*psz_bands ) break; /* end of line */
psz_bands = p_next+1;
}
free( psz_bands_init );
[self setBandSlidersValues:f_band];
/* Set the the checkboxes */
[o_ckb_enable setState: b_enabled];
[o_ckb_2pass setState: b_2p];
}
- (IBAction)bandSliderUpdated:(id)sender
{
intf_thread_t *p_intf = VLCIntf;
vlc_object_t *p_object = VLC_OBJECT(getAout());
if( p_object == NULL )
p_object = vlc_object_hold(pl_Get( p_intf ));
const char *psz_values;
NSString *preset = [NSString stringWithFormat:@"%.1f ", [o_slider_band1 floatValue] ];
preset = [preset stringByAppendingFormat:@"%.1f ", [o_slider_band2 floatValue] ];
preset = [preset stringByAppendingFormat:@"%.1f ", [o_slider_band3 floatValue] ];
preset = [preset stringByAppendingFormat:@"%.1f ", [o_slider_band4 floatValue] ];
preset = [preset stringByAppendingFormat:@"%.1f ", [o_slider_band5 floatValue] ];
preset = [preset stringByAppendingFormat:@"%.1f ", [o_slider_band6 floatValue] ];
preset = [preset stringByAppendingFormat:@"%.1f ", [o_slider_band7 floatValue] ];
preset = [preset stringByAppendingFormat:@"%.1f ", [o_slider_band8 floatValue] ];
preset = [preset stringByAppendingFormat:@"%.1f ", [o_slider_band9 floatValue] ];
preset = [preset stringByAppendingFormat:@"%.1f", [o_slider_band10 floatValue] ];
psz_values = [preset UTF8String];
var_SetString( p_object, "equalizer-bands", psz_values );
if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES )
{
/* save changed to config */
config_PutPsz( p_intf, "equalizer-bands", psz_values );
}
vlc_object_release( p_object );
}
- (IBAction)changePreset:(id)sender
{
intf_thread_t *p_intf = VLCIntf;
int i;
vlc_object_t *p_object= VLC_OBJECT(getAout());
if( p_object == NULL )
p_object = vlc_object_hold(pl_Get( p_intf ));
var_SetString( p_object , "equalizer-preset" , preset_list[[sender indexOfSelectedItem]] );
NSString *preset = @"";
const char *psz_values;
for( i = 0; i < 10; i++ )
{
preset = [preset stringByAppendingFormat:@"%.1f ", eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[i] ];
}
psz_values = [preset UTF8String];
var_SetString( p_object, "equalizer-bands", psz_values );
var_SetFloat( p_object, "equalizer-preamp", eqz_preset_10b[[sender indexOfSelectedItem]]->f_preamp);
[o_slider_preamp setFloatValue: eqz_preset_10b[[sender indexOfSelectedItem]]->f_preamp];
[self setBandSlidersValues:(float *)eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp];
if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES )
{
/* save changed to config */
config_PutPsz( p_intf, "equalizer-bands", psz_values );
config_PutFloat( p_intf, "equalizer-preamp", eqz_preset_10b[[sender indexOfSelectedItem]]->f_preamp );
config_PutPsz( p_intf, "equalizer-preset", preset_list[[sender indexOfSelectedItem]] );
}
vlc_object_release( p_object );
}
- (IBAction)enable:(id)sender
{
// ChangeFiltersString( VLCIntf, (char *)"equalizer", [sender state] );
// to fix #3718
aout_EnableFilter( pl_Get( VLCIntf ), (char *)"equalizer", [sender state]);
}
- (IBAction)preampSliderUpdated:(id)sender
{
intf_thread_t *p_intf = VLCIntf;
float f_preamp = [sender floatValue] ;
vlc_object_t *p_object = VLC_OBJECT(getAout());
if( p_object == NULL )
p_object = vlc_object_hold(pl_Get( p_intf ));
var_SetFloat( p_object, "equalizer-preamp", f_preamp );
if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES )
{
/* save changed to config */
config_PutFloat( p_intf, "equalizer-preamp", f_preamp );
}
vlc_object_release( p_object );
}
- (IBAction)toggleWindow:(id)sender
{
if( [o_window isVisible] )
{
[o_window orderOut:sender];
[o_btn_equalizer setState:NSOffState];
}
else
{
[o_window makeKeyAndOrderFront:sender];
[o_btn_equalizer setState:NSOnState];
}
}
- (IBAction)twopass:(id)sender
{
intf_thread_t *p_intf = VLCIntf;
bool b_2p = [sender state] ? true : false;
aout_instance_t *p_aout = getAout();
vlc_object_t *p_object= VLC_OBJECT(p_aout);
if( p_object == NULL )
p_object = vlc_object_hold(pl_Get( p_intf ));
var_SetBool( p_object, "equalizer-2pass", b_2p );
if( (BOOL)config_GetInt( p_intf, "macosx-eq-keep" ) == YES )
{
/* save changed to config */
config_PutInt( p_intf, "equalizer-2pass", (int)b_2p );
}
vlc_object_release( p_object );
}
- (void)windowDidBecomeKey:(NSNotification *)aNotification
{
[o_btn_equalizer setState: NSOnState];
}
- (void)windowWillClose:(NSNotification *)aNotification
{
[o_btn_equalizer setState: NSOffState];
}
- (void)awakeFromNib
{
int i;
vlc_object_t *p_object= VLC_OBJECT(getAout());
if( p_object == NULL )
p_object = vlc_object_hold(pl_Get( VLCIntf ));
[o_window setExcludedFromWindowsMenu: TRUE];
[self initStrings];
if( p_object )
{
char *psz_preset;
var_Create( p_object, "equalizer-preset", VLC_VAR_STRING |
VLC_VAR_DOINHERIT );
psz_preset = var_GetNonEmptyString( p_object, "equalizer-preset" );
for( i = 0 ; (psz_preset != NULL) && (i < 18) ; i++ )
{
if( strcmp( preset_list[i], psz_preset ) )
continue;
[o_popup_presets selectItemAtIndex: i];
[o_slider_preamp setFloatValue: eqz_preset_10b[i]->f_preamp];
[self setBandSlidersValues: (float *)eqz_preset_10b[i]->f_amp];
if( strcmp( psz_preset, "flat" ) )
{
char psz_bands[100];
snprintf( psz_bands, sizeof( psz_bands ),
"%.1f %.1f %.1f %.1f %.1f %.1f %.1f "
"%.1f %.1f %.1f",
eqz_preset_10b[i]->f_amp[0],
eqz_preset_10b[i]->f_amp[1],
eqz_preset_10b[i]->f_amp[2],
eqz_preset_10b[i]->f_amp[3],
eqz_preset_10b[i]->f_amp[4],
eqz_preset_10b[i]->f_amp[5],
eqz_preset_10b[i]->f_amp[6],
eqz_preset_10b[i]->f_amp[7],
eqz_preset_10b[i]->f_amp[8],
eqz_preset_10b[i]->f_amp[9] );
var_Create( p_object, "equalizer-preamp", VLC_VAR_FLOAT |
VLC_VAR_DOINHERIT );
var_Create( p_object, "equalizer-bands", VLC_VAR_STRING |
VLC_VAR_DOINHERIT );
var_SetFloat( p_object, "equalizer-preamp",
eqz_preset_10b[i]->f_preamp );
var_SetString( p_object, "equalizer-bands", psz_bands );
}
}
free( psz_preset );
vlc_object_release( p_object );
}
[self equalizerUpdated];
}
- (id)sliderByIndex:(int)index
{
switch(index)
{
case 0 : return o_slider_band1;
case 1 : return o_slider_band2;
case 2 : return o_slider_band3;
case 3 : return o_slider_band4;
case 4 : return o_slider_band5;
case 5 : return o_slider_band6;
case 6 : return o_slider_band7;
case 7 : return o_slider_band8;
case 8 : return o_slider_band9;
case 9 : return o_slider_band10;
default : return nil;
}
}
- (void)setBandSlidersValues:(float *)values
{
int i = 0;
for (i = 0 ; i<= 9 ; i++)
{
[self setValue:values[i] forSlider:i];
}
}
- (void)initBandSliders
{
int i = 0;
for (i = 0 ; i< 9 ; i++)
{
[self setValue:0.0 forSlider:i];
}
}
- (void)setValue:(float)value forSlider:(int)index
{
id slider = [self sliderByIndex:index];
if (slider != nil)
{
[slider setFloatValue:value];
}
}
@end
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