Commit 36ef2f6c authored by Felix Paul Kühne's avatar Felix Paul Kühne

* port of the WX-advanded-GUI to OSX (refs #268)

- the adjust-image-filter and the audio-filters are completely useable

ToDo:
- complete i18n support
- video-filters
- loading the settings from the prefs correctly
- probably minor layout tweaks, etc.
parent 7088b9a6
......@@ -561,6 +561,8 @@ VLC-release.app: vlc
voutgl.m \
wizard.h \
wizard.m \
extended.h \
extended.m \
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
......@@ -671,6 +673,8 @@ VLC.app: vlc
voutgl.m \
wizard.h \
wizard.m \
extended.h \
extended.m \
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
......
{
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
ACTIONS = {
"adjImg_Enbl" = id;
"adjImg_rstrDefaults" = id;
"adjImg_sliders" = id;
"audFtls_hdphnVirt" = id;
"audFtls_maxLevelSld" = id;
"audFtls_vlmeNorm" = id;
"extWin_exp_adjImg" = id;
"extWin_exp_audFlts" = id;
"extWin_exp_vidFlts" = id;
vidFlts = id;
"vidFlts_mrInfo" = id;
};
CLASS = VLCExtended;
LANGUAGE = ObjC;
OUTLETS = {
"o_adjustImg_view" = id;
"o_audioFlts_view" = id;
"o_box_adjImg" = id;
"o_box_audFlts" = id;
"o_box_vidFlts" = id;
"o_btn_rstrDefaults" = id;
"o_btn_vidFlts_mrInfo" = id;
"o_ckb_blur" = id;
"o_ckb_distortion" = id;
"o_ckb_enblAdjustImg" = id;
"o_ckb_hdphnVirt" = id;
"o_ckb_imgClone" = id;
"o_ckb_imgCrop" = id;
"o_ckb_imgInvers" = id;
"o_ckb_trnsform" = id;
"o_ckb_vlme_norm" = id;
"o_expBtn_adjustImage" = id;
"o_expBtn_audioFlts" = id;
"o_expBtn_videoFlts" = id;
"o_extWin_adjImg_sepe" = id;
"o_extWin_vidFlts_sepe" = id;
"o_extended_window" = id;
"o_lbl_adjustImage" = id;
"o_lbl_audioFlts" = id;
"o_lbl_brightness" = id;
"o_lbl_contrast" = id;
"o_lbl_gamma" = id;
"o_lbl_hue" = id;
"o_lbl_maxLevel" = id;
"o_lbl_saturation" = id;
"o_lbl_videoFlts" = id;
"o_sld_brightness" = id;
"o_sld_contrast" = id;
"o_sld_gamma" = id;
"o_sld_hue" = id;
"o_sld_maxLevel" = id;
"o_sld_saturation" = id;
"o_videoFilters_view" = id;
};
SUPERCLASS = NSObject;
}
);
IBVersion = 1;
}
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>219 20 356 292 0 0 1440 878 </string>
<key>IBEditorPositions</key>
<dict>
<key>13</key>
<string>506 668 390 138 0 0 1440 878 </string>
<key>32</key>
<string>525 497 390 213 0 0 1440 878 </string>
<key>5</key>
<string>598 370 390 196 0 0 1440 878 </string>
</dict>
<key>IBFramework Version</key>
<string>437.0</string>
<key>IBLockedObjects</key>
<array>
<integer>32</integer>
</array>
<key>IBOpenObjects</key>
<array>
<integer>18</integer>
<integer>32</integer>
<integer>5</integer>
</array>
<key>IBSystem Version</key>
<string>8C46</string>
</dict>
</plist>
......@@ -2,12 +2,6 @@
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = MPSlider; LANGUAGE = ObjC; SUPERCLASS = NSSlider; },
{
ACTIONS = {showPanel = id; };
CLASS = VLAboutBox;
LANGUAGE = ObjC;
SUPERCLASS = NSObject;
},
{CLASS = VLBrushedMetalImageView; LANGUAGE = ObjC; SUPERCLASS = NSImageView; },
{CLASS = VLCApplication; LANGUAGE = ObjC; SUPERCLASS = NSApplication; },
{CLASS = VLCControllerView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
......@@ -71,6 +65,43 @@
};
SUPERCLASS = NSObject;
},
{
CLASS = VLCExtended;
LANGUAGE = ObjC;
OUTLETS = {
"o_adjustImg_view" = id;
"o_audioFlts_view" = id;
"o_btn_rstrDefaults" = id;
"o_btn_vidFlts_mrInfo" = id;
"o_ckb_blur" = id;
"o_ckb_distortion" = id;
"o_ckb_enblAdjustImg" = id;
"o_ckb_hdphn_virt" = id;
"o_ckb_imgClone" = id;
"o_ckb_imgCrop" = id;
"o_ckb_imgInvers" = id;
"o_ckb_trnsform" = id;
"o_ckb_vlme_norm" = id;
"o_expBtn_adjustImage" = id;
"o_expBtn_audioFlts" = id;
"o_expBtn_videoFlts" = id;
"o_extended_window" = id;
"o_lbl_brightness" = id;
"o_lbl_contrast" = id;
"o_lbl_gamma" = id;
"o_lbl_hue" = id;
"o_lbl_maxLevel" = id;
"o_lbl_saturation" = id;
"o_sld_brightness" = id;
"o_sld_contrast" = id;
"o_sld_gamma" = id;
"o_sld_hue" = id;
"o_sld_maxLevel" = id;
"o_sld_saturation" = id;
"o_videoFilters_view" = id;
};
SUPERCLASS = NSObject;
},
{
ACTIONS = {
createOutlineGroup = id;
......@@ -113,6 +144,7 @@
openRecentItem = id;
openWebsite = id;
reportABug = id;
showExtended = id;
showWizard = id;
timesliderUpdate = id;
togglePlaylist = id;
......@@ -162,6 +194,7 @@
"o_mi_documentation" = id;
"o_mi_double_window" = id;
"o_mi_equalizer" = id;
"o_mi_extended" = id;
"o_mi_faster" = id;
"o_mi_ffmpeg_pp" = id;
"o_mi_fittoscreen" = id;
......@@ -242,8 +275,6 @@
};
SUPERCLASS = NSObject;
},
{CLASS = VLCOpen; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = VLCOutput; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
ACTIONS = {
deleteItem = id;
......@@ -285,22 +316,7 @@
};
SUPERCLASS = NSObject;
},
{CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{
ACTIONS = {advancedToggle = id; closePrefs = id; resetAll = id; savePrefs = id; };
CLASS = VLCPrefs;
LANGUAGE = ObjC;
OUTLETS = {
"o_advanced_ckb" = id;
"o_cancel_btn" = id;
"o_prefs_view" = id;
"o_prefs_window" = id;
"o_reset_btn" = id;
"o_save_btn" = id;
"o_tree" = id;
};
SUPERCLASS = NSObject;
}
{CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }
);
IBVersion = 1;
}
\ No newline at end of file
......@@ -3,13 +3,13 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>43 309 496 270 0 0 1024 746 </string>
<string>52 78 496 270 0 0 1440 878 </string>
<key>IBEditorPositions</key>
<dict>
<key>1617</key>
<string>542 480 104 149 0 0 1024 746 </string>
<key>2197</key>
<string>214 442 596 144 0 0 1024 746 </string>
<string>422 532 596 143 0 0 1440 878 </string>
<key>29</key>
<string>557 789 437 44 0 0 1440 878 </string>
<key>915</key>
......@@ -21,10 +21,11 @@
<array/>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
<integer>2029</integer>
<integer>21</integer>
<integer>29</integer>
</array>
<key>IBSystem Version</key>
<string>8C40</string>
<string>8C46</string>
</dict>
</plist>
......@@ -813,6 +813,7 @@
DCF358BB077F10BA007DB450,
DCA693C30789DF8700139EC6,
DCFCCDB9085CE18F001E36AF,
DC7F46ED08A183FC0027DB24,
);
isa = PBXResourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
......@@ -895,6 +896,8 @@
8E9CA1A606D7DEE800B7186C,
DC769AB8085DF0DB001A838D,
DC769AB7085DF0DB001A838D,
DC7F46F008A187F60027DB24,
DC7F46F108A187F60027DB24,
);
isa = PBXGroup;
name = Classes;
......@@ -2159,12 +2162,15 @@
//DC4
DC769AB7085DF0DB001A838D = {
fileEncoding = 5;
indentWidth = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
name = wizard.m;
path = ../../modules/gui/macosx/wizard.m;
refType = 2;
sourceTree = SOURCE_ROOT;
tabWidth = 4;
usesTabs = 0;
};
DC769AB8085DF0DB001A838D = {
fileEncoding = 5;
......@@ -2175,6 +2181,50 @@
refType = 2;
sourceTree = SOURCE_ROOT;
};
DC7F46EB08A183FC0027DB24 = {
children = (
DC7F46EC08A183FC0027DB24,
);
isa = PBXVariantGroup;
name = Extended.nib;
path = "";
refType = 4;
sourceTree = "<group>";
};
DC7F46EC08A183FC0027DB24 = {
isa = PBXFileReference;
lastKnownFileType = wrapper.nib;
name = English;
path = Resources/English.lproj/Extended.nib;
refType = 4;
sourceTree = "<group>";
};
DC7F46ED08A183FC0027DB24 = {
fileRef = DC7F46EB08A183FC0027DB24;
isa = PBXBuildFile;
settings = {
};
};
DC7F46F008A187F60027DB24 = {
explicitFileType = sourcecode.c.objc;
fileEncoding = 5;
isa = PBXFileReference;
name = extended.h;
path = ../../modules/gui/macosx/extended.h;
refType = 2;
sourceTree = SOURCE_ROOT;
usesTabs = 0;
};
DC7F46F108A187F60027DB24 = {
explicitFileType = sourcecode.c.objc;
fileEncoding = 5;
includeInIndex = 0;
isa = PBXFileReference;
name = extended.m;
path = ../../modules/gui/macosx/extended.m;
refType = 2;
sourceTree = SOURCE_ROOT;
};
DCA00AA7075F948800E6BF46 = {
children = (
DCA00AA8075F948800E6BF46,
......@@ -2260,6 +2310,7 @@
DCF358B9077F10BA007DB450,
DCA693C10789DF8700139EC6,
DCFCCDB7085CE18F001E36AF,
DC7F46EB08A183FC0027DB24,
);
isa = PBXGroup;
name = nibs;
......
......@@ -30,5 +30,7 @@ SOURCES_macosx = \
vout.h \
wizard.h \
wizard.m \
extended.h \
extended.m \
$(NULL)
/*****************************************************************************
* extended.h: MacOS X Extended interface panel
*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
* $Id$
*
* Authors: Felix Khne <fkuehne@users.sf.net>
*
* 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.
*****************************************************************************/
/*****************************************************************************
* VLCExtended
*****************************************************************************/
#import <Cocoa/Cocoa.h>
@interface VLCExtended : NSObject
{
/* views and window */
IBOutlet id o_adjustImg_view;
IBOutlet id o_audioFlts_view;
IBOutlet id o_videoFilters_view;
IBOutlet id o_extended_window;
/* window content */
IBOutlet id o_expBtn_adjustImage;
IBOutlet id o_expBtn_audioFlts;
IBOutlet id o_expBtn_videoFlts;
IBOutlet id o_lbl_audioFlts;
IBOutlet id o_lbl_videoFlts;
IBOutlet id o_lbl_adjustImage;
IBOutlet id o_extWin_adjImg_sepe;
IBOutlet id o_extWin_vidFlts_sepe;
IBOutlet id o_box_vidFlts;
IBOutlet id o_box_audFlts;
IBOutlet id o_box_adjImg;
/* video filters */
IBOutlet id o_btn_vidFlts_mrInfo;
IBOutlet id o_ckb_blur;
IBOutlet id o_ckb_distortion;
IBOutlet id o_ckb_imgClone;
IBOutlet id o_ckb_imgCrop;
IBOutlet id o_ckb_imgInvers;
IBOutlet id o_ckb_trnsform;
/* audio filters */
IBOutlet id o_ckb_vlme_norm;
IBOutlet id o_ckb_hdphnVirt;
IBOutlet id o_lbl_maxLevel;
IBOutlet id o_sld_maxLevel;
/* adjust image */
IBOutlet id o_btn_rstrDefaults;
IBOutlet id o_ckb_enblAdjustImg;
IBOutlet id o_lbl_brightness;
IBOutlet id o_lbl_contrast;
IBOutlet id o_lbl_gamma;
IBOutlet id o_lbl_hue;
IBOutlet id o_lbl_saturation;
IBOutlet id o_sld_brightness;
IBOutlet id o_sld_contrast;
IBOutlet id o_sld_gamma;
IBOutlet id o_sld_hue;
IBOutlet id o_sld_saturation;
/* global variables */
BOOL * o_adjImg_expanded;
BOOL * o_audFlts_expanded;
BOOL * o_vidFlts_expanded;
}
- (IBAction)adjImg_Enbl:(id)sender;
- (IBAction)adjImg_rstrDefaults:(id)sender;
- (IBAction)adjImg_sliders:(id)sender;
- (IBAction)audFtls_hdphnVirt:(id)sender;
- (IBAction)audFtls_maxLevelSld:(id)sender;
- (IBAction)audFtls_vlmeNorm:(id)sender;
- (IBAction)extWin_exp_adjImg:(id)sender;
- (IBAction)extWin_exp_audFlts:(id)sender;
- (IBAction)extWin_exp_vidFlts:(id)sender;
- (IBAction)vidFlts:(id)sender;
- (IBAction)vidFlts_mrInfo:(id)sender;
+ (VLCExtended *)sharedInstance;
- (void)showPanel;
- (void)initStrings;
- (void)changeVFiltersString: (char *)psz_name onOrOff: (BOOL)o_onOrOff;
- (void)changeAFiltersString: (char *)psz_name onOrOff: (BOOL)o_onOrOff;
@end
/*****************************************************************************
* extended.m: MacOS X Extended interface panel
*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
* $Id$
*
* Authors: Felix Khne <fkuehne@users.sf.net>
*
* 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.
*****************************************************************************/
/*****************************************************************************
* Note:
* the code used to bind with VLC's modules is heavily based upon
* ../wxwidgets/extrapanel.cpp, written by Clment Stenac.
* the code used to insert/remove the view and resize/remove the other stuff
* was inspired by intf.m, written by Derk-Jan Hartman.
* (both are members of the VideoLAN team)
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#import "extended.h"
#import "intf.h"
#import <vlc/vlc.h>
#import <vlc/aout.h>
#import <aout_internal.h>
#import <vlc/vout.h>
#import <vlc/intf.h>
/*****************************************************************************
* VLCExtended implementation
*****************************************************************************/
@implementation VLCExtended
static VLCExtended *_o_sharedInstance = nil;
+ (VLCExtended *)sharedInstance
{
return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
}
- (id)init
{
if (_o_sharedInstance) {
[self dealloc];
} else {
_o_sharedInstance = [super init];
}
return _o_sharedInstance;
}
- (void)initStrings
{
/* localise GUI-strings */
/* method is called from intf.m (in method showExtended) */
}
- (void)awakeFromNib
{
/* set the adjust-filter-sliders to the values from the prefs and enable
* them, if wanted */
char * psz_vfilters;
intf_thread_t * p_intf = VLCIntf;
psz_vfilters = config_GetPsz( p_intf, "vout-filter" );
if( psz_vfilters && strstr( psz_vfilters, "adjust" ) )
{
[o_ckb_enblAdjustImg setState: NSOnState];
[o_btn_rstrDefaults setEnabled: YES];
[o_sld_brightness setEnabled: YES];
[o_sld_contrast setEnabled: YES];
[o_sld_gamma setEnabled: YES];
[o_sld_hue setEnabled: YES];
[o_sld_saturation setEnabled: YES];
}
else
{
[o_ckb_enblAdjustImg setState: NSOffState];
[o_btn_rstrDefaults setEnabled: NO];
[o_sld_brightness setEnabled: NO];
[o_sld_contrast setEnabled: NO];
[o_sld_gamma setEnabled: NO];
[o_sld_hue setEnabled: NO];
[o_sld_saturation setEnabled: NO];
}
if( psz_vfilters ) free( psz_vfilters );
int i_value = config_GetInt( p_intf, "hue" );
if( i_value > 0 && i_value < 360 )
{
[o_sld_hue setIntValue: i_value];
}
float f_value;
f_value = config_GetFloat( p_intf, "saturation" );
if( f_value > 0 && f_value < 5 )
{
[o_sld_saturation setIntValue: (int)(100 * f_value) ];
}
f_value = config_GetFloat( p_intf, "contrast" );
if( f_value > 0 && f_value < 4 )
{
[o_sld_contrast setIntValue: (int)(100 * f_value) ];
}
f_value = config_GetFloat( p_intf, "brightness" );
if( f_value > 0 && f_value < 2 )
{
[o_sld_brightness setIntValue: (int)(100 * f_value) ];
}
f_value = config_GetFloat( p_intf, "gamma" );
if( f_value > 0 && f_value < 10 )
{
[o_sld_gamma setIntValue: (int)(10 * f_value) ];
}
/* set the audio-filter-checkboxes to the values taken from the prefs */
char * psz_afilters;
psz_afilters = config_GetPsz( p_intf, "audio-filter" );
if( psz_afilters )
{
[o_ckb_hdphnVirt setState: (int)strstr( psz_afilters, "headphone" ) ];
[o_ckb_vlme_norm setState: (int)strstr( psz_afilters, "normvol" ) ];
free( psz_afilters );
}
}
- (void)showPanel
{
/* show the window */
[o_extended_window displayIfNeeded];
[o_extended_window makeKeyAndOrderFront:nil];
}
- (IBAction)adjImg_Enbl:(id)sender
{
/* en-/disable the sliders */
if ([o_ckb_enblAdjustImg state] == NSOnState)
{
[o_btn_rstrDefaults setEnabled: YES];
[o_sld_brightness setEnabled: YES];
[o_sld_contrast setEnabled: YES];
[o_sld_gamma setEnabled: YES];
[o_sld_hue setEnabled: YES];
[o_sld_saturation setEnabled: YES];
[self changeVFiltersString: "adjust" onOrOff: YES];
}else{
[o_btn_rstrDefaults setEnabled: NO];
[o_sld_brightness setEnabled: NO];
[o_sld_contrast setEnabled: NO];
[o_sld_gamma setEnabled: NO];
[o_sld_hue setEnabled: NO];
[o_sld_saturation setEnabled: NO];
[self changeVFiltersString: "adjust" onOrOff: NO];
}
}
- (IBAction)adjImg_rstrDefaults:(id)sender
{
/* reset the sliders */
[o_sld_brightness setIntValue: 100];
[o_sld_contrast setIntValue: 100];
[o_sld_gamma setIntValue: 10];
[o_sld_hue setIntValue: 0];
[o_sld_saturation setIntValue: 100];
/* transmit the values */
[self adjImg_sliders: o_sld_brightness];
[self adjImg_sliders: o_sld_contrast];
[self adjImg_sliders: o_sld_gamma];
[self adjImg_sliders: o_sld_hue];
[self adjImg_sliders: o_sld_saturation];
}
- (IBAction)adjImg_sliders:(id)sender
{
/* read-out the sliders' values and apply them */
intf_thread_t * p_intf = VLCIntf;
vout_thread_t *p_vout = (vout_thread_t *)vlc_object_find(p_intf,
VLC_OBJECT_VOUT, FIND_ANYWHERE);
if( p_vout == NULL )
{
if (sender == o_sld_brightness)
{
config_PutFloat( p_intf , "brightness" , [o_sld_brightness floatValue] / 100);
} else if (sender == o_sld_contrast)
{
config_PutFloat( p_intf , "contrast" , [o_sld_contrast floatValue] / 100);
} else if (sender == o_sld_gamma)
{
config_PutFloat( p_intf , "gamma" , [o_sld_gamma floatValue] / 10);
} else if (sender == o_sld_hue)
{
config_PutInt( p_intf , "hue" , [o_sld_hue intValue]);
} else if (sender == o_sld_saturation)
{
config_PutFloat( p_intf , "saturation" , [o_sld_saturation floatValue] / 100);
}
} else {
vlc_value_t val;
if (sender == o_sld_brightness)
{
val.f_float = [o_sld_brightness floatValue] / 100;
var_Set( p_vout, "brightness", val );
config_PutFloat( p_intf , "brightness" , [o_sld_brightness floatValue] / 100);
} else if (sender == o_sld_contrast)
{
val.f_float = [o_sld_contrast floatValue] / 100;
var_Set( p_vout, "contrast", val );
config_PutFloat( p_intf , "contrast" , [o_sld_contrast floatValue] / 100);
} else if (sender == o_sld_gamma)
{
val.f_float = [o_sld_gamma floatValue] / 10;
var_Set( p_vout, "gamma", val );
config_PutFloat( p_intf , "gamma" , [o_sld_gamma floatValue] / 10);
} else if (sender == o_sld_hue)
{
val.i_int = [o_sld_hue intValue];
var_Set( p_vout, "hue", val );
config_PutInt( p_intf , "hue" , [o_sld_hue intValue]);
} else if (sender == o_sld_saturation)
{
val.f_float = [o_sld_saturation floatValue] / 100;
var_Set( p_vout, "saturation", val );
config_PutFloat( p_intf , "saturation" , [o_sld_saturation floatValue] / 100);
}
}
}
- (IBAction)audFtls_hdphnVirt:(id)sender
{
/* en-/disable headphone virtualisation */
if ([o_ckb_hdphnVirt state] == NSOnState)
{
[self changeAFiltersString: "headphone" onOrOff: YES ];
}else{