Changeset 887efa47545fa1e6b08acdb1d1a026049bbafe75

Timestamp:

27/02/08 22:30:20 (8 months ago)

Author:

Felix Paul Kühne <fkuehne@videolan.org>

git-committer:

Felix Paul Kühne <fkuehne@videolan.org> 1204147820 +0000

git-parent:

[9ab3a0540fa0d21cc18116bbd5fc03cd21e3a0fc]

git-author:

Felix Paul Kühne <fkuehne@videolan.org> 1204147820 +0000

Message:

macosx: Implemented the Subs/OSD and Input categories of the Simple Prefs

Files:

• extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib (modified) (3 diffs)
• extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib (modified) (4 diffs)
• extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib (modified) (previous)
• modules/gui/macosx/simple_prefs.h (modified) (4 diffs)
• modules/gui/macosx/simple_prefs.m (modified) (20 diffs)

extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib

@@ -28 +28 @@
-                audioSettingChanged = id; 
-                buttonAction = id; 
+                inputSettingChanged = id; 
-                interfaceSettingChanged = id; 
+                osdSettingChanged = id; 
-                videoSettingChanged = id; 
-            }; 
@@ -57 +59 @@
-                "o_audio_vol_sld" = id; 
-                "o_audio_vol_txt" = id; 
+                "o_input_access_box" = id; 
+                "o_input_avi_pop" = id; 
+                "o_input_avi_txt" = id; 
+                "o_input_bandwidth_ckb" = id; 
+                "o_input_cachelevel_pop" = id; 
+                "o_input_cachelevel_txt" = id; 
+                "o_input_caching_box" = id; 
+                "o_input_dump_ckb" = id; 
+                "o_input_httpproxy_fld" = id; 
+                "o_input_httpproxy_txt" = id; 
+                "o_input_mux_box" = id; 
+                "o_input_net_box" = id; 
+                "o_input_postproc_fld" = id; 
+                "o_input_postproc_txt" = id; 
+                "o_input_record_ckb" = id; 
+                "o_input_rtsp_ckb" = id; 
+                "o_input_serverport_fld" = id; 
+                "o_input_serverport_txt" = id; 
+                "o_input_timeshift_ckb" = id; 
+                "o_input_view" = id; 
-                "o_intf_art_pop" = id; 
-                "o_intf_art_txt" = id; 
@@ -66 +88 @@
-                "o_intf_network_box" = id; 
-                "o_intf_view" = id; 
+                "o_osd_encoding_pop" = id; 
+                "o_osd_encoding_txt" = id; 
+                "o_osd_font_box" = id; 
+                "o_osd_font_btn" = id; 
+                "o_osd_font_color_pop" = id; 
+                "o_osd_font_color_txt" = id; 
+                "o_osd_font_effect_pop" = id; 
+                "o_osd_font_effect_txt" = id; 
+                "o_osd_font_fld" = id; 
+                "o_osd_font_size_pop" = id; 
+                "o_osd_font_size_txt" = id; 
+                "o_osd_font_txt" = id; 
+                "o_osd_lang_box" = id; 
+                "o_osd_lang_fld" = id; 
+                "o_osd_lang_txt" = id; 
+                "o_osd_osd_box" = id; 
+                "o_osd_osd_ckb" = id; 
+                "o_osd_view" = id; 
-                "o_sprefs_basicFull_matrix" = id; 
-                "o_sprefs_basic_box" = id; 

extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib

@@ -4 +4 @@
-<dict>
-    <key>IBDocumentLocation</key>
-113 117
+391 94
-    <key>IBEditorPositions</key>
-    <dict>
@@ -10 +10 @@
-        <string>345 406 590 264 0 0 1280 778 </string>
-        <key>2330</key>
-450 263
+345 266
-        <key>2440</key>
-        <string>345 343 590 389 0 0 1280 778 </string>
+        <key>2523</key>
+        <string>345 351 590 373 0 0 1280 778 </string>
+        <key>2562</key>
+        <string>345 310 590 455 0 0 1280 778 </string>
-    </dict>
-    <key>IBFramework Version</key>
@@ -25 +29 @@
-    </dict>
-    <key>IBLastGroupID</key>
-2
+3
-    <key>IBLockedObjects</key>
-    <array>
@@ -35 +39 @@
-    <key>IBOpenObjects</key>
-    <array>
+        <integer>2265</integer>
+        <integer>2523</integer>
+        <integer>2562</integer>
+        <integer>2440</integer>
-        <integer>2311</integer>
-        <integer>2440</integer>
-        <integer>2265</integer>
-        <integer>2330</integer>
-    </array>
-    <key>IBSystem Version</key>

modules/gui/macosx/simple_prefs.h

@@ -52 +52 @@
-    IBOutlet id o_audio_vol_txt;
-
+    IBOutlet id o_input_access_box;
+    IBOutlet id o_input_avi_pop;
+    IBOutlet id o_input_avi_txt;
+    IBOutlet id o_input_bandwidth_ckb;
+    IBOutlet id o_input_cachelevel_pop;
+    IBOutlet id o_input_cachelevel_txt;
+    IBOutlet id o_input_caching_box;
+    IBOutlet id o_input_dump_ckb;
+    IBOutlet id o_input_httpproxy_fld;
+    IBOutlet id o_input_httpproxy_txt;
+    IBOutlet id o_input_mux_box;
+    IBOutlet id o_input_net_box;
+    IBOutlet id o_input_postproc_fld;
+    IBOutlet id o_input_postproc_txt;
+    IBOutlet id o_input_record_ckb;
+    IBOutlet id o_input_rtsp_ckb;
+    IBOutlet id o_input_serverport_fld;
+    IBOutlet id o_input_serverport_txt;
+    IBOutlet id o_input_timeshift_ckb;
+    IBOutlet id o_input_view;
+
-    IBOutlet id o_intf_art_pop;
-    IBOutlet id o_intf_art_txt;
@@ -61 +82 @@
-    IBOutlet id o_intf_network_box;
-    IBOutlet id o_intf_view;
+
+    IBOutlet id o_osd_encoding_pop;
+    IBOutlet id o_osd_encoding_txt;
+    IBOutlet id o_osd_font_box;
+    IBOutlet id o_osd_font_btn;
+    IBOutlet id o_osd_font_color_pop;
+    IBOutlet id o_osd_font_color_txt;
+    IBOutlet id o_osd_font_effect_pop;
+    IBOutlet id o_osd_font_effect_txt;
+    IBOutlet id o_osd_font_fld;
+    IBOutlet id o_osd_font_size_pop;
+    IBOutlet id o_osd_font_size_txt;
+    IBOutlet id o_osd_font_txt;
+    IBOutlet id o_osd_lang_box;
+    IBOutlet id o_osd_lang_fld;
+    IBOutlet id o_osd_lang_txt;
+    IBOutlet id o_osd_osd_box;
+    IBOutlet id o_osd_osd_ckb;
+    IBOutlet id o_osd_view;
-
-    IBOutlet id o_sprefs_basic_box;
@@ -94 +134 @@
-    BOOL b_intfSettingChanged;
-    BOOL b_videoSettingChanged;
+    BOOL b_osdSettingChanged;
+    BOOL b_inputSettingChanged;
-    id o_currentlyShownCategoryView;
-
+
-    NSToolbar *o_sprefs_toolbar;
-    NSOpenPanel *o_selectFolderPanel;
-
+
-    intf_thread_t *p_intf;
-}
@@ -133 +175 @@
-- (void)showVideoSettings;
-
-
+
+
+
-
-/* input & codecs */
+- (IBAction)inputSettingChanged:(id)sender;
+- (void)showInputSettings;
-
-/* hotkeys */

modules/gui/macosx/simple_prefs.m

@@ -29 +29 @@
-static NSString* VLCAudioSettingToolbarIdentifier = @"Audio Settings Item Identifier";
-static NSString* VLCVideoSettingToolbarIdentifier = @"Video Settings Item Identifier";
+static NSString* VLCOSDSettingToolbarIdentifier = @"Subtitles Settings Item Identifier";
+static NSString* VLCInputSettingToolbarIdentifier = @"Input Settings Item Identifier";
+static NSString* VLCHotkeysSettingToolbarIdentifier = @"Hotkeys Settings Item Identifier";
-
-@implementation VLCSimplePrefs
@@ -116 +119 @@
-    {
-        o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease];
-
+
-        [o_toolbarItem setLabel: _NS("Video")];
-        [o_toolbarItem setPaletteLabel: _NS("General Video settings")];
-
+
-        [o_toolbarItem setToolTip: _NS("General Video settings")];
-        [o_toolbarItem setImage: [NSImage imageNamed: @"spref_cone_Video_64"]];
-
+
-        [o_toolbarItem setTarget: self];
-        [o_toolbarItem setAction: @selector(showVideoSettings)];
-
+
-        [o_toolbarItem setEnabled: YES];
-        [o_toolbarItem setAutovalidates: YES];
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return o_toolbarItem;
-}
@@ -135 +170 @@
-- (NSArray *)toolbarDefaultItemIdentifiers: (NSToolbar *)toolbar
-{
-
+
+
-}
-
-- (NSArray *)toolbarAllowedItemIdentifiers: (NSToolbar *)toolbar
-{
-
+
+
-}
-
-- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
-{
-
+
+
-}
-
-- (void)initStrings
-{
-
+is 
-}
-
@@ -159 +197 @@
-    char *psz_tmp;
-
+    #define SetupIntList( object, name ) \
+    [object removeAllItems]; \
+    p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
+    for( i = 0; i < p_item->i_list; i++ ) \
+    { \
+        if( p_item->ppsz_list_text[i] != NULL) \
+            [object addItemWithTitle: _NS( p_item->ppsz_list_text[i] )]; \
+        else \
+            [object addItemWithTitle: [NSString stringWithUTF8String: p_item->ppsz_list[i]]]; \
+    } \
+    if( p_item->value.i < [object numberOfItems] ) \
+        [object selectItemAtIndex: p_item->value.i]; \
+    else \
+        [object selectItemAtIndex: 0]
+
+    #define SetupStringList( object, name ) \
+        [object removeAllItems]; \
+        y = 0; \
+        p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
+        for( i = 0; p_item->ppsz_list[i] != nil; i++ ) \
+        { \
+            [object addItemWithTitle: _NS( p_item->ppsz_list_text[i] )]; \
+            if( p_item->value.psz && !strcmp( p_item->value.psz, p_item->ppsz_list[i] ) ) \
+                y = i; \
+        } \
+        [object selectItemAtIndex: y]
+
-    /**********************
-     * interface settings *
-     **********************/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    [o_intf_meta_ckb setState: config_GetInt( p_intf, "fetch-meta" )];
-    [o_intf_fspanel_ckb setState: config_GetInt( p_intf, "macosx-fspanel" )];
-    [o_intf_embedded_ckb setState: config_GetInt( p_intf, "embedded-video" )];
-
-
-    /******************
@@ -193 +243 @@
-    [o_audio_spdif_ckb setState: config_GetInt( p_intf, "spdif" )];
-
-
-
-
-
-
-
-
+
+
-    [o_audio_lang_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "audio-language" )]];
-
@@ -217 +262 @@
-        [o_audio_lastuser_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-username" )]];
-        [o_audio_lastpwd_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-password" )]];
-
+
-        if( config_ExistIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ) )
-            [o_audio_last_ckb setState: NSOnState];
@@ -239 +284 @@
-    [o_video_snap_prefix_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "snapshot-prefix" )]];
-    [o_video_snap_seqnum_ckb setState: config_GetInt( p_intf, "snapshot-sequential" )];
-[o_video_snap_format_pop removeAllItems];
+
-    p_item = config_FindConfig( VLC_OBJECT(p_intf), "snapshot-format" );
-    for( i = 0; p_item->ppsz_list[i] != nil; i++ )
@@ -249 +294 @@
-    [o_video_snap_format_pop selectItemAtIndex: y];
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /*********************
-     * subtitle settings *
-     *********************/
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /********************
-     * hotkeys settings *
@@ -306 +436 @@
-    {
-        config_ResetAll( p_intf );
-, b_videoSettingChanged,
+ = b_videoSettingChanged =
-        [self resetControls];
-    }
@@ -317 +447 @@
-    int i;
-    
+#define SaveIntList( object, name ) \
+    p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
+    if( [object indexOfSelectedItem] >= 0 ) \
+        config_PutInt( p_intf, name, p_item->pi_list[[object indexOfSelectedItem]] ); \
+    else \
+        config_PutInt( p_intf, name, [object intValue] ) \
+                    
+#define SaveStringList( object, name ) \
+    p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
+    if( [object indexOfSelectedItem] >= 0 ) \
+        config_PutPsz( p_intf, name, strdup( p_item->ppsz_list[[object indexOfSelectedItem]] ) ); \
+    else \
+        config_PutPsz( p_intf, name, strdup( [[VLCMain sharedInstance] delocalizeString: [object stringValue]] ) )
+
-    /**********************
-     * interface settings *
@@ -322 +466 @@
-    if( b_intfSettingChanged )
-    {
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-        config_PutInt( p_intf, "fetch-meta", [o_intf_meta_ckb state] );
@@ -360 +495 @@
-        config_PutInt( p_intf, "spdif", [o_audio_spdif_ckb state] );
-
-
-
-
-
-
+
-
-        config_PutPsz( p_intf, "audio-language", [[o_audio_lang_fld stringValue] UTF8String] );
@@ -391 +522 @@
-        /* Last.FM is optional */
-        if( module_Exists( p_intf, "audioscrobbler" ) )
-        
+
-            if( [o_audio_last_ckb state] == NSOnState )
-                config_AddIntf( VLC_OBJECT( p_intf ), "audioscrobbler" );
@@ -436 +567 @@
-        i = config_SaveConfigFile( p_intf, "main" );
-        i = i + config_SaveConfigFile( p_intf, "macosx" );
-
+
-        if( i != 0 )
-        {
@@ -444 +575 @@
-        b_videoSettingChanged = NO;
-    }
+    
+    /***************************
+     * input & codecs settings *
+     ***************************/
+    if( b_inputSettingChanged )
+    {
+        config_PutInt( p_intf, "server-port", [o_input_serverport_fld intValue] );
+        config_PutPsz( p_intf, "http-proxy", [[o_input_httpproxy_fld stringValue] UTF8String] );
+        config_PutInt( p_intf, "ffmpeg-pp-q", [o_input_postproc_fld intValue] );
+
+        SaveIntList( o_input_avi_pop, "avi-index" );
+
+        config_PutInt( p_intf, "rtsp-tcp", [o_input_rtsp_ckb state] );
+
+        #define CaCi( name, int ) config_PutInt( p_intf, name, int * [[o_input_cachelevel_pop selectedItem] tag] )
+        #define CaC( name ) CaCi( name, 1 )
+        msg_Dbg( p_intf, "Adjusting all cache values at: %i", [[o_input_cachelevel_pop selectedItem] tag] );
+        CaC( "udp-caching" );
+        if( module_Exists (p_intf, "dvdread" ) )
+        {
+            CaC( "dvdread-caching" );
+            i = i + config_SaveConfigFile( p_intf, "dvdread" );
+        }
+        if( module_Exists (p_intf, "dvdnav" ) )
+        {
+            CaC( "dvdnav-caching" );
+            i = i + config_SaveConfigFile( p_intf, "dvdnav" );
+        }
+        CaC( "tcp-caching" ); CaC( "vcd-caching" );
+        CaC( "fake-caching" ); CaC( "cdda-caching" ); CaC( "file-caching" );
+        CaC( "screen-caching" );
+        CaCi( "rtsp-caching", 4 ); CaCi( "ftp-caching", 2 );
+        CaCi( "http-caching", 4 );
+        if( module_Exists (p_intf, "access_realrtsp" ) )
+        {
+            CaCi( "realrtsp-caching", 10 );
+            i = i + config_SaveConfigFile( p_intf, "access_realrtsp" );
+        }
+        CaCi( "mms-caching", 19 );
+
+        #define SaveAccessFilter( object, name ) \
+        if( [object state] == NSOnState ) \
+        { \
+            if( b_first ) \
+            { \
+                [o_temp appendString: name]; \
+                b_first = NO; \
+            } \
+            else \
+                [o_temp appendFormat: @":%@", name]; \
+        }
+
+        BOOL b_first = YES;
+        NSMutableString *o_temp = [[NSMutableString alloc] init];
+        SaveAccessFilter( o_input_record_ckb, @"record" );
+        SaveAccessFilter( o_input_dump_ckb, @"dump" );
+        SaveAccessFilter( o_input_bandwidth_ckb, @"bandwidth" );
+        SaveAccessFilter( o_input_timeshift_ckb, @"timeshift" );
+        config_PutPsz( p_intf, "access-filter", [o_temp UTF8String] );
+        [o_temp release];
+
+        i = config_SaveConfigFile( p_intf, "main" );
+        i = i + config_SaveConfigFile( p_intf, "ffmpeg" );
+        i = i + config_SaveConfigFile( p_intf, "access_http" );
+        i = i + config_SaveConfigFile( p_intf, "access_file" );
+        i = i + config_SaveConfigFile( p_intf, "access_tcp" );
+        i = i + config_SaveConfigFile( p_intf, "access_fake" );
+        i = i + config_SaveConfigFile( p_intf, "cdda" );
+        i = i + config_SaveConfigFile( p_intf, "screen" );
+        i = i + config_SaveConfigFile( p_intf, "vcd" );
+        i = i + config_SaveConfigFile( p_intf, "access_ftp" );
+        i = i + config_SaveConfigFile( p_intf, "access_mms" );
+        i = i + config_SaveConfigFile( p_intf, "live555" );
+
+        if( i != 0 )
+        {
+            msg_Err( p_intf, "An error occured while saving the Input settings using SimplePrefs" );
+            i = 0;
+        }
+        b_inputSettingChanged = NO;
+    }
+    
+    /**********************
+     * subtitles settings *
+     **********************/
+    if( b_osdSettingChanged )
+    {
+        config_PutInt( p_intf, "osd", [o_osd_osd_ckb state] );
+
+        if( [o_osd_encoding_pop indexOfSelectedItem] >= 0 )
+            config_PutPsz( p_intf, "subsdec-encoding", [[[o_osd_encoding_pop selectedItem] title] UTF8String] );
+
+        config_PutPsz( p_intf, "sub-language", [[o_osd_lang_fld stringValue] UTF8String] );
+        config_PutPsz( p_intf, "freetype-font", [[o_osd_font_fld stringValue] UTF8String] );
+
+        SaveIntList( o_osd_font_color_pop, "freetype-color" );
+        SaveIntList( o_osd_font_size_pop, "freetype-rel-fontsize" );
+        SaveIntList( o_osd_font_effect_pop, "freetype-effect" );
+
+        i = config_SaveConfigFile( p_intf, NULL );
+
+        if( i != 0 )
+        {
+            msg_Err( p_intf, "An error occured while saving the OSD/Subtitle settings using SimplePrefs" );
+            i = 0;
+        }
+        b_osdSettingChanged = NO;
+    }
+    
+    /********************
+     * hotkeys settings *
+     ********************/
-}
-
@@ -457 +700 @@
-        o_old_view_rect = [o_currentlyShownCategoryView frame];
-        o_win_rect.size.height = o_win_rect.size.height - o_old_view_rect.size.height;
-
+
-        /* remove our previous category view */
-        [o_currentlyShownCategoryView removeFromSuperviewWithoutNeedingDisplay];
@@ -518 +761 @@
-        [o_selectFolderPanel setResolvesAliases: YES];
-        [o_selectFolderPanel setAllowsMultipleSelection: NO];
-F
+f
-        [o_selectFolderPanel setCanCreateDirectories: YES];
-        [o_selectFolderPanel setPrompt: _NS("Choose")];
@@ -524 +767 @@
-                                      modalDelegate: self 
-                                     didEndSelector: @selector(savePanelDidEnd:returnCode:contextInfo:)
-nil
+o_video_snap_folder_btn
-    }
-    else
@@ -534 +777 @@
-    if( returnCode == NSOKButton )
-    {
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -546 +797 @@
-    [self showSettingsForCategory: o_video_view];
-}
+
+- (IBAction)osdSettingChanged:(id)sender
+{
+    if( sender == o_osd_font_btn )
+    {
+        o_selectFolderPanel = [[NSOpenPanel alloc] init];
+        [o_selectFolderPanel setCanChooseDirectories: NO];
+        [o_selectFolderPanel setCanChooseFiles: YES];
+        [o_selectFolderPanel setResolvesAliases: YES];
+        [o_selectFolderPanel setAllowsMultipleSelection: NO];
+        [o_selectFolderPanel setMessage: _NS("Choose the font to display your Subtitles with.")];
+        [o_selectFolderPanel setCanCreateDirectories: NO];
+        [o_selectFolderPanel setPrompt: _NS("Choose")];
+        [o_selectFolderPanel setAllowedFileTypes: [NSArray arrayWithObjects: @"dfont", @"ttf", @"otf", @"FFIL", nil]];
+        [o_selectFolderPanel beginSheetForDirectory: @"/System/Library/Fonts/" file: nil modalForWindow: o_sprefs_win 
+                                      modalDelegate: self 
+                                     didEndSelector: @selector(savePanelDidEnd:returnCode:contextInfo:)
+                                        contextInfo: o_osd_font_btn];
+    }
+    else
+        b_osdSettingChanged = YES;
+}
+
+- (void)showOSDSettings
+{
+    msg_Dbg( p_intf, "showing OSD settings" );
+    [self showSettingsForCategory: o_osd_view];
+}
+
+- (IBAction)inputSettingChanged:(id)sender
+{
+    b_inputSettingChanged = YES;
+}
+
+- (void)showInputSettings
+{
+    msg_Dbg( p_intf, "showing Input Settings" );
+    [self showSettingsForCategory: o_input_view];
+}
+
-@end