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
Hide 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
......@@ -4,7 +4,7 @@
* Copyright (C) 2004 VideoLAN
* $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
* it under the terms of the GNU General Public License as published by
......@@ -33,24 +33,24 @@
#include <math.h>
#include "equalizer.h"
#include "../../audio_filter/equalizer_presets.h"
/*****************************************************************************
* VLCEqualizer implementation
*****************************************************************************/
@implementation VLCEqualizer
static void ChangeFiltersString( playlist_t *p_playlist,
aout_instance_t *p_aout,
static void ChangeFiltersString( intf_thread_t *p_intf,
char *psz_name, vlc_bool_t b_add )
{
char *psz_parser, *psz_string;
vlc_object_t *p_object = NULL;
int i;
if( p_playlist != NULL )
p_object = ( vlc_object_t* )p_playlist;
if( p_aout != NULL )
p_object = ( vlc_object_t* )p_aout;
vlc_object_t *p_object = vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
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 );
if( p_object == NULL )
return;
......@@ -103,25 +103,24 @@ static void ChangeFiltersString( playlist_t *p_playlist,
}
}
free( psz_string );
vlc_object_release( p_object );
}
static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist,
aout_instance_t *p_aout,
static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
char *psz_name )
{
char *psz_parser, *psz_string;
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;
vlc_object_t *p_object = vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL )
p_object = vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_object == NULL )
return VLC_FALSE;
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 );
......@@ -133,81 +132,65 @@ static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist,
return VLC_FALSE;
}
- (IBAction)bandSliderUpdated:(id)sender
- (void)initStrings
{
intf_thread_t *p_intf = VLCIntf;
aout_instance_t *p_aout = ( aout_instance_t * )vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
playlist_t *p_playlist = ( playlist_t * )vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
vlc_object_t *p_object = NULL;
char psz_values[102];
memset( psz_values, 0, 102 );
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 )
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] );
var_SetString( p_object, "equalizer-bands", psz_values );
if( p_aout )
vlc_object_release( p_aout );
if( p_playlist )
vlc_object_release( p_playlist );
int i;
[o_btn_equalizer setToolTip: _NS("Equalizer")];
[o_ckb_2pass setTitle: _NS("2 Pass")];
[o_ckb_2pass setToolTip: _NS("If you enable this settting, the "
"equalizer filter will be applied twice. The effect will be sharper")];
[o_ckb_enable setTitle: _NS("Enable")];
[o_ckb_enable setToolTip: _NS("Enable the equalizer. You can either "
"manually change the bands or use 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[i]) atIndex: i];
}
[o_window setTitle: _NS("Equalizer")];
[o_slider_band1 setFloatValue: 0];
[o_slider_band2 setFloatValue: 0];
[o_slider_band3 setFloatValue: 0];
[o_slider_band4 setFloatValue: 0];
[o_slider_band5 setFloatValue: 0];
[o_slider_band6 setFloatValue: 0];
[o_slider_band7 setFloatValue: 0];
[o_slider_band8 setFloatValue: 0];
[o_slider_band9 setFloatValue: 0];
[o_slider_band10 setFloatValue: 0];
[o_ckb_enable setState: NSOffState];
[o_ckb_2pass setState: NSOffState];
}
- (IBAction)changePreset:(id)sender
- (void)equalizerUpdated
{
intf_thread_t *p_intf = VLCIntf;
float f_preamp, f_band[10];
char *psz_bands, *p_next;
vlc_bool_t b_2p;
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 );
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_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 )
{
msg_Dbg( p_intf, "equalizer settings not set: no playlist nor aout found");
return;
}
var_SetString( p_object , "equalizer-preset" , preset_list[[sender indexOfSelectedItem]] );
f_preamp = var_GetFloat( p_object, "equalizer-preamp" );
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" );
vlc_object_release( p_object );
/* Set the preamp slider */
......@@ -227,6 +210,8 @@ static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist,
if( !*psz_bands ) break; /* end of line */
psz_bands = p_next+1;
}
free( psz_bands );
[o_slider_band1 setFloatValue: f_band[0]];
[o_slider_band2 setFloatValue: f_band[1]];
[o_slider_band3 setFloatValue: f_band[2]];
......@@ -237,59 +222,105 @@ static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist,
[o_slider_band8 setFloatValue: f_band[7]];
[o_slider_band9 setFloatValue: f_band[8]];
[o_slider_band10 setFloatValue: f_band[9]];
/* Set the the checkboxes */
if( b_enabled == VLC_TRUE )
[o_btn_enable setState:NSOnState];
[o_ckb_enable setState:NSOnState];
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;
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 );
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 );
ChangeFiltersString( p_playlist, p_aout, "equalizer", [sender state] );
if( p_object == NULL )
return;
[o_popup_presets setEnabled: [sender state]];
if( p_aout != NULL )
vlc_object_release( p_aout );
if( p_playlist != NULL )
vlc_object_release( p_playlist );
/* 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] );
var_SetString( p_object, "equalizer-bands", psz_values );
vlc_object_release( p_object );
}
- (IBAction)preampSliderUpdated:(id)sender
- (IBAction)changePreset:(id)sender
{
intf_thread_t *p_intf = VLCIntf;
float f_preamp= [sender floatValue] ;
int i;
vlc_object_t *p_object= vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
char psz_values[102];
memset( psz_values, 0, 102 );
aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
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 );
if( p_object == NULL )
return;
var_SetString( p_object , "equalizer-preset" , preset_list[[sender indexOfSelectedItem]] );
for( i = 0; i < 10; i++ )
sprintf( psz_values, "%s %.1f", psz_values, eqz_preset_10b[[sender indexOfSelectedItem]]->f_amp[i] );
var_SetString( p_object, "equalizer-bands", psz_values );
vlc_object_t *p_object = NULL;
[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]];
if( p_playlist != NULL )
p_object = ( vlc_object_t* )p_playlist;
if( p_aout != NULL )
p_object = ( vlc_object_t* )p_aout;
vlc_object_release( p_object );
}
- (IBAction)enable:(id)sender
{
ChangeFiltersString( VLCIntf, "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_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
if( p_object == NULL )
p_object = vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_object == NULL )
{
msg_Dbg( p_intf, "equalizer settings not set: no playlist nor aout found");
return;
}
var_SetFloat( p_object, "equalizer-preamp", f_preamp );
if( p_aout != NULL )
vlc_object_release( p_aout );
if( p_playlist != NULL )
vlc_object_release( p_playlist );
vlc_object_release( p_object );
}
- (IBAction)toggleWindow:(id)sender
......@@ -301,77 +332,6 @@ static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist,
}
else
{
intf_thread_t *p_intf = VLCIntf;
float f_preamp, f_band[10];
char *psz_bands, *p_next;
vlc_bool_t b_2p;
int i;
aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
playlist_t *p_playlist = ( playlist_t * )vlc_object_find( p_intf,
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 )
{
msg_Dbg( p_intf, "equalizer settings not set: no playlist nor aout found");
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 )
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 */
[o_slider_preamp setFloatValue: f_preamp];
/* Set the bands slider */
for( i = 0; i < 10; i++ )
{
/* Read dB -20/20 */
#ifdef HAVE_STRTOF
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
[o_btn_enable setState:NSOffState];
[o_btn_2pass setState:( ( b_2p == VLC_TRUE ) ? NSOnState : NSOffState )];
[o_window makeKeyAndOrderFront:sender];
[o_btn_equalizer setState:NSOnState];
}
......@@ -380,26 +340,18 @@ static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist,
- (IBAction)twopass:(id)sender
{
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 );
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_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 )
{
msg_Dbg( p_intf, "equalizer settings not set: no playlist nor aout found");
return;
}
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;
for( i = 0; i < p_aout->i_nb_inputs; i++ )
......@@ -408,10 +360,20 @@ static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist,
}
}
if( p_aout != NULL )
vlc_object_release( p_aout );
if( p_playlist != NULL )
vlc_object_release( p_playlist );
vlc_object_release( p_object );
}
- (void)windowWillClose:(NSNotification *)aNotification
{
[o_btn_equalizer setState: NSOffState];
}
- (void)awakeFromNib
{
[o_window setExcludedFromWindowsMenu: TRUE];
[self initStrings];
[self equalizerUpdated];
}
@end
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
......@@ -46,7 +46,7 @@ static void Run ( intf_thread_t *p_intf );
* OpenIntf: initialize interface
*****************************************************************************/
int E_(OpenIntf) ( vlc_object_t *p_this )
{
{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
......@@ -56,7 +56,7 @@ int E_(OpenIntf) ( vlc_object_t *p_this )
}
memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) );
p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
/* Put Cocoa into multithread mode as soon as possible.
......@@ -64,7 +64,7 @@ int E_(OpenIntf) ( vlc_object_t *p_this )
* TasksAndConcepts/ProgrammingTopics/Multithreading/index.html
* This thread does absolutely nothing at all. */
[NSThread detachNewThreadSelector:@selector(self) toTarget:[NSString string] withObject:nil];
p_intf->p_sys->o_sendport = [[NSPort port] retain];
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
p_intf->b_play = VLC_TRUE;
......@@ -79,12 +79,12 @@ int E_(OpenIntf) ( vlc_object_t *p_this )
void E_(CloseIntf) ( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
[p_intf->p_sys->o_sendport release];
[p_intf->p_sys->o_pool release];
free( p_intf->p_sys );
}
......@@ -116,7 +116,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
withObject: [NSValue valueWithPointer: p_arg]
waitUntilDone: NO];
}
else if( NSApp != nil && [[VLCMain sharedInstance] respondsToSelector: @selector(getIntf)] )
else if( NSApp != nil && [[VLCMain sharedInstance] respondsToSelector: @selector(getIntf)] )
{
NSValue * o_v1;
NSValue * o_v2;
......@@ -133,7 +133,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
p_intf = (intf_thread_t *)VLCIntf;
o_recv_port = [[NSPort port] retain];
o_v1 = [NSValue valueWithPointer: val];
o_v1 = [NSValue valueWithPointer: val];
o_v2 = [NSValue valueWithPointer: p_arg];
o_sig = [target methodSignatureForSelector: sel];
......@@ -156,7 +156,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
[o_msg release];
[o_recv_port release];
}
}
else
{
i_ret = 1;
......@@ -184,7 +184,7 @@ static struct
{
unichar i_nskey;
unsigned int i_vlckey;
} nskeys_to_vlckeys[] =
} nskeys_to_vlckeys[] =
{
{ NSUpArrowFunctionKey, KEY_UP },
{ NSDownArrowFunctionKey, KEY_DOWN },
......@@ -218,7 +218,7 @@ static struct
unichar VLCKeyToCocoa( unsigned int i_key )
{
unsigned int i;
for( i = 0; nskeys_to_vlckeys[i].i_vlckey != 0; i++ )
{
if( nskeys_to_vlckeys[i].i_vlckey == (i_key & ~KEY_MODIFIER) )
......@@ -232,7 +232,7 @@ unichar VLCKeyToCocoa( unsigned int i_key )
unsigned int CocoaKeyToVLC( unichar i_key )
{
unsigned int i;
for( i = 0; nskeys_to_vlckeys[i].i_nskey != 0; i++ )
{
if( nskeys_to_vlckeys[i].i_nskey == i_key )
......@@ -258,7 +258,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
}
/*****************************************************************************
* VLCMain implementation
* VLCMain implementation
*****************************************************************************/
@implementation VLCMain
......@@ -269,14 +269,14 @@ static VLCMain *_o_sharedMainInstance = nil;
return _o_sharedMainInstance ? _o_sharedMainInstance : [[self alloc] init];
}
- (id)init
- (id)init
{
if( _o_sharedMainInstance) {
[self dealloc];
} else {
_o_sharedMainInstance = [super init];
}
return _o_sharedMainInstance;
}
......@@ -298,7 +298,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_window setExcludedFromWindowsMenu: TRUE];
[o_msgs_panel setExcludedFromWindowsMenu: TRUE];
[o_msgs_panel setDelegate: self];
i_key = config_GetInt( p_intf, "key-quit" );
[o_mi_quit setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_quit setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
......@@ -355,7 +355,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[self setSubmenusEnabled: FALSE];
[self manageVolumeSlider];
p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_playlist )
......@@ -386,7 +386,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_volumeslider setToolTip: _NS("Volume")];
[o_timeslider setToolTip: _NS("Position")];
/* messages panel */
/* messages panel */
[o_msgs_panel setTitle: _NS("Messages")];
[o_msgs_btn_crashlog setTitle: _NS("Open CrashLog")];
......@@ -435,7 +435,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_mu_title setTitle: _NS("Title")];
[o_mi_chapter setTitle: _NS("Chapter")];
[o_mu_chapter setTitle: _NS("Chapter")];
[o_mu_audio setTitle: _NS("Audio")];
[o_mi_vol_up setTitle: _NS("Volume Up")];
[o_mi_vol_down setTitle: _NS("Volume Down")];
......@@ -448,7 +448,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_mu_device setTitle: _NS("Audio Device")];
[o_mi_visual setTitle: _NS("Visualizations")];
[o_mu_visual setTitle: _NS("Visualizations")];
[o_mu_video setTitle: _NS("Video")];
[o_mi_half_window setTitle: _NS("Half Size")];
[o_mi_normal_window setTitle: _NS("Normal Size")];
......@@ -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")];
......@@ -492,7 +493,7 @@ static VLCMain *_o_sharedMainInstance = nil;
/* error panel */
[o_error setTitle: _NS("Error")];
[o_err_lbl setStringValue: _NS("An error has occurred which probably prevented the execution of your request:")];
[o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, please follow the instructions at:")];
[o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, please follow the instructions at:")];
[o_err_btn_msgs setTitle: _NS("Open Messages Window")];
[o_err_btn_dismiss setTitle: _NS("Dismiss")];
[o_err_ckbk_surpress setTitle: _NS("Suppress further errors")];
......@@ -511,7 +512,7 @@ static VLCMain *_o_sharedMainInstance = nil;
o_img_pause_pressed = [[NSImage imageNamed: @"pause_blue"] retain];
[p_intf->p_sys->o_sendport setDelegate: self];
[[NSRunLoop currentRunLoop]
[[NSRunLoop currentRunLoop]
addPort: p_intf->p_sys->o_sendport
forMode: NSDefaultRunLoopMode];
......@@ -521,7 +522,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[NSThread detachNewThreadSelector: @selector(manage)
toTarget: self withObject: nil];
[o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf
var: "intf-add" selector: @selector(toggleVar:)];
......@@ -533,7 +534,7 @@ static VLCMain *_o_sharedMainInstance = nil;
NSDictionary *o_dic = [NSDictionary dictionaryWithObjectsAndKeys: o_filename, @"ITEM_URL", nil];
[o_playlist appendArray:
[NSArray arrayWithObject: o_dic] atPos: -1 enqueue: NO];
return( TRUE );
}
......@@ -563,7 +564,7 @@ static VLCMain *_o_sharedMainInstance = nil;
{
o_data = [id dataUsingEncoding: NSUTF8StringEncoding
allowLossyConversion: YES];
psz_string = malloc( [o_data length] + 1 );
psz_string = malloc( [o_data length] + 1 );
[o_data getBytes: psz_string];
psz_string[ [o_data length] ] = '\0';
msg_Err( VLCIntf, "cannot convert to wanted encoding: %s",
......@@ -571,7 +572,7 @@ static VLCMain *_o_sharedMainInstance = nil;
}
else
{
psz_string = malloc( [o_data length] + 1 );
psz_string = malloc( [o_data length] + 1 );
[o_data getBytes: psz_string];
psz_string[ [o_data length] ] = '\0';
}
......@@ -594,15 +595,15 @@ static VLCMain *_o_sharedMainInstance = nil;
NSLayoutManager *o_layout_manager = [[NSLayoutManager alloc] init];
NSTextContainer *o_container = [[NSTextContainer alloc]
initWithContainerSize: NSMakeSize(i_width, 2000)];
[o_layout_manager addTextContainer: o_container];
[o_container release];
[o_storage addLayoutManager: o_layout_manager];
[o_layout_manager release];
o_wrapped = [o_in_string mutableCopy];
glyphRange = [o_layout_manager glyphRangeForTextContainer: o_container];
for( glyphIndex = glyphRange.location ; glyphIndex < NSMaxRange(glyphRange) ;
glyphIndex += effectiveRange.length) {
lineFragmentRect = [o_layout_manager lineFragmentRectForGlyphAtIndex: glyphIndex
......@@ -618,7 +619,7 @@ static VLCMain *_o_sharedMainInstance = nil;
o_out_string = [NSString stringWithString: o_wrapped];
[o_wrapped release];
[o_storage release];
return o_out_string;
}
......@@ -697,13 +698,13 @@ static VLCMain *_o_sharedMainInstance = nil;
{
NSDate * o_sleep_date;
playlist_t * p_playlist;
/* new thread requires a new pool */
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist != NULL )
......@@ -719,12 +720,12 @@ static VLCMain *_o_sharedMainInstance = nil;
vlc_mutex_lock( &p_intf->change_lock );
#define p_input p_intf->p_sys->p_input
if( p_input == NULL )
{
p_input = (input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
FIND_ANYWHERE );
/* Refresh the interface */
if( p_input )
{
......@@ -780,8 +781,8 @@ static VLCMain *_o_sharedMainInstance = nil;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
b_plmul = p_playlist->i_size > 1;
vlc_object_release( p_playlist );
vlc_object_release( p_playlist );
if( ( b_input = ( p_input != NULL ) ) )
{
......@@ -790,10 +791,10 @@ static VLCMain *_o_sharedMainInstance = nil;
b_seekable = val.b_bool;
/* check wether slow/fast motion is possible*/
b_control = p_input->input.b_can_pace_control;
b_control = p_input->input.b_can_pace_control;
/* chapters & titles */
//b_chapters = p_input->stream.i_area_nb > 1;
//b_chapters = p_input->stream.i_area_nb > 1;
}
[o_btn_stop setEnabled: b_input];
......@@ -808,13 +809,13 @@ static VLCMain *_o_sharedMainInstance = nil;
p_intf->p_sys->b_intf_update = VLC_FALSE;
}
if ( p_intf->p_sys->b_playlist_update )
{
[o_playlist playlistUpdated];
p_intf->p_sys->b_playlist_update = VLC_FALSE;
}
if( p_intf->p_sys->b_fullscreen_update )
{
vout_thread_t * p_vout;
......@@ -856,7 +857,7 @@ static VLCMain *_o_sharedMainInstance = nil;
}
vlc_mutex_lock( &p_playlist->object_lock );
o_temp = [NSString stringWithUTF8String:
o_temp = [NSString stringWithUTF8String:
p_playlist->pp_items[p_playlist->i_index]->input.psz_name];
if( o_temp == NULL )
o_temp = [NSString stringWithCString:
......@@ -871,7 +872,7 @@ static VLCMain *_o_sharedMainInstance = nil;
{
id o_vout_wnd;
NSEnumerator * o_enum = [[NSApp orderedWindows] objectEnumerator];
while( ( o_vout_wnd = [o_enum nextObject] ) )
{
if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] )
......@@ -894,24 +895,24 @@ static VLCMain *_o_sharedMainInstance = nil;
mtime_t i_seconds;
vlc_value_t pos;
float f_updated;
var_Get( p_input, "position", &pos );
f_updated = 10000. * pos.f_float;
[o_timeslider setFloatValue: f_updated];
var_Get( p_input, "time", &time );
i_seconds = time.i_time / 1000000;
o_time = [NSString stringWithFormat: @"%d:%02d:%02d",
(int) (i_seconds / (60 * 60)),
(int) (i_seconds / 60 % 60),
(int) (i_seconds % 60)];
[o_timefield setStringValue: o_time];
}
/* Manage volume status */
[self manageVolumeSlider];
/* Manage Playing status */
var_Get( p_input, "state", &val );
if( p_intf->p_sys->i_play_status != val.i_int )
......@@ -939,9 +940,8 @@ static VLCMain *_o_sharedMainInstance = nil;
- (void)setupMenus
{
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 );
if( p_playlist != NULL )
{
#define p_input p_playlist->p_input
......@@ -949,45 +949,45 @@ static VLCMain *_o_sharedMainInstance = nil;
{
[o_controls setupVarMenuItem: o_mi_program target: (vlc_object_t *)p_input
var: "program" selector: @selector(toggleVar:)];
[o_controls setupVarMenuItem: o_mi_title target: (vlc_object_t *)p_input
var: "title" selector: @selector(toggleVar:)];
[o_controls setupVarMenuItem: o_mi_chapter target: (vlc_object_t *)p_input
var: "chapter" selector: @selector(toggleVar:)];
[o_controls setupVarMenuItem: o_mi_audiotrack target: (vlc_object_t *)p_input
var: "audio-es" selector: @selector(toggleVar:)];
[o_controls setupVarMenuItem: o_mi_videotrack target: (vlc_object_t *)p_input
var: "video-es" selector: @selector(toggleVar:)];
[o_controls setupVarMenuItem: o_mi_subtitle target: (vlc_object_t *)p_input
var: "spu-es" selector: @selector(toggleVar:)];
aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
FIND_ANYWHERE );
if ( p_aout != NULL )
{
[o_controls setupVarMenuItem: o_mi_channels target: (vlc_object_t *)p_aout
var: "audio-channels" selector: @selector(toggleVar:)];
[o_controls setupVarMenuItem: o_mi_device target: (vlc_object_t *)p_aout
var: "audio-device" selector: @selector(toggleVar:)];
[o_controls setupVarMenuItem: o_mi_visual target: (vlc_object_t *)p_aout
var: "visual" selector: @selector(toggleVar:)];
vlc_object_release( (vlc_object_t *)p_aout );
}
vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
FIND_ANYWHERE );
if ( p_vout != NULL )
{
[o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout
var: "video-device" selector: @selector(toggleVar:)];
[o_controls setupVarMenuItem: o_mi_deinterlace target: (vlc_object_t *)p_vout
var: "deinterlace" selector: @selector(toggleVar:)];
vlc_object_release( (vlc_object_t *)p_vout );
......@@ -1121,7 +1121,7 @@ static VLCMain *_o_sharedMainInstance = nil;
aout_VolumeGet( p_intf, &i_volume );
[o_volumeslider setFloatValue: (float)i_volume / AOUT_VOLUME_STEP];
[o_volumeslider setFloatValue: (float)i_volume / AOUT_VOLUME_STEP];
[o_volumeslider setEnabled: TRUE];
p_intf->p_sys->b_mute = ( i_volume == 0 );
......@@ -1160,7 +1160,7 @@ static VLCMain *_o_sharedMainInstance = nil;
var_Get( p_input, "time", &time );
i_seconds = time.i_time / 1000000;
o_time = [NSString stringWithFormat: @"%d:%02d:%02d",
(int) (i_seconds / (60 * 60)),
(int) (i_seconds / 60 % 60),
......@@ -1202,13 +1202,13 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_img_pause_pressed release];
o_img_pause_pressed = nil;
}
if( o_img_pause_pressed != nil )
{
[o_img_pause_pressed release];
o_img_pause_pressed = nil;
}
if( o_img_pause != nil )
{
[o_img_pause release];
......@@ -1236,7 +1236,7 @@ static VLCMain *_o_sharedMainInstance = nil;
/* write cached user defaults to disk */
[[NSUserDefaults standardUserDefaults] synchronize];
p_intf->b_die = VLC_TRUE;
[NSApp stop:NULL];
}
......@@ -1249,7 +1249,7 @@ static VLCMain *_o_sharedMainInstance = nil;
- (void)openRecentItem:(id)sender
{
[self application: nil openFile: [sender title]];
[self application: nil openFile: [sender title]];
}
- (IBAction)viewPreferences:(id)sender
......@@ -1272,16 +1272,16 @@ static VLCMain *_o_sharedMainInstance = nil;
- (IBAction)openReadMe:(id)sender
{
NSString * o_path = [[NSBundle mainBundle]
pathForResource: @"README.MacOSX" ofType: @"rtf"];
NSString * o_path = [[NSBundle mainBundle]
pathForResource: @"README.MacOSX" ofType: @"rtf"];
[[NSWorkspace sharedWorkspace] openFile: o_path
[[NSWorkspace sharedWorkspace] openFile: o_path
withApplication: @"TextEdit"];
}
- (IBAction)openDocumentation:(id)sender
{
NSURL * o_url = [NSURL URLWithString:
NSURL * o_url = [NSURL URLWithString:
@"http://www.videolan.org/doc/"];
[[NSWorkspace sharedWorkspace] openURL: o_url];
......@@ -1289,7 +1289,7 @@ static VLCMain *_o_sharedMainInstance = nil;
- (IBAction)reportABug:(id)sender
{
NSURL * o_url = [NSURL URLWithString:
NSURL * o_url = [NSURL URLWithString:
@"http://www.videolan.org/support/bug-reporting.html"];
[[NSWorkspace sharedWorkspace] openURL: o_url];
......@@ -1304,22 +1304,22 @@ static VLCMain *_o_sharedMainInstance = nil;
- (IBAction)openLicense:(id)sender
{
NSString * o_path = [[NSBundle mainBundle]
NSString * o_path = [[NSBundle mainBundle]
pathForResource: @"COPYING" ofType: nil];
[[NSWorkspace sharedWorkspace] openFile: o_path
[[NSWorkspace sharedWorkspace] openFile: o_path
withApplication: @"TextEdit"];
}
- (IBAction)openCrashLog:(id)sender
{
NSString * o_path = [@"~/Library/Logs/CrashReporter/VLC.crash.log"
stringByExpandingTildeInPath];
stringByExpandingTildeInPath];
if ( [[NSFileManager defaultManager] fileExistsAtPath: o_path ] )
{
[[NSWorkspace sharedWorkspace] openFile: o_path
[[NSWorkspace sharedWorkspace] openFile: o_path
withApplication: @"Console"];
}
else
......@@ -1336,7 +1336,7 @@ static VLCMain *_o_sharedMainInstance = nil;
id o_msg;
NSEnumerator * o_enum;
[o_messages setString: @""];
[o_messages setString: @""];
[o_msg_lock lock];
......@@ -1407,13 +1407,13 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_menu insertItemWithTitle: o_doc
action: @selector(openRecentItem:)
keyEquivalent: @"" atIndex: 0];
keyEquivalent: @"" atIndex: 0];
if( i_nb_docs == 0 )
{
break;
}
}
}
}
else
{
......@@ -1434,9 +1434,9 @@ static VLCMain *_o_sharedMainInstance = nil;
NSValue * o_value;
NSInvocation * o_inv;
NSConditionLock * o_lock;
o_data = [[o_msg components] lastObject];
o_inv = *((NSInvocation **)[o_data bytes]);
o_inv = *((NSInvocation **)[o_data bytes]);
[o_inv getArgument: &o_value atIndex: 2];
val = (id **)[o_value pointerValue];
[o_inv setArgument: val[1] atIndex: 2];
......
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