Changeset 8679868f312aef7645ed56706b7886fe7e06d283

Timestamp:

03/24/08 22:04:48 (5 months ago)

Author:

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

git-committer:

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

git-parent:

[daa7c08f86f23fc4cd301f2c48e8540dc3a8f117]

git-author:

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

Message:

implemented the Visualiser and Video Output module settings

Files:

• extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib (modified) (1 diff)
• extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib (modified) (previous)
• modules/gui/macosx/simple_prefs.m (modified) (9 diffs)

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

@@ -11 +11 @@
-    <key>IBOpenObjects</key>
-    <array>
+        <integer>2668</integer>
-        <integer>2562</integer>
-        <integer>2410</integer>
-        <integer>2440</integer>
+        <integer>2311</integer>
-        <integer>2523</integer>
+        <integer>2330</integer>
-        <integer>2678</integer>
-        <integer>2668</integer>
-        <integer>2311</integer>
-    </array>
-    <key>IBSystem Version</key>

modules/gui/macosx/simple_prefs.m

@@ -295 +295 @@
-    [o_video_fullscreen_ckb setTitle: _NS("Fullscreen")];
-    [o_video_onTop_ckb setTitle: _NS("Always on top")];
-Display devic
+Output modul
-    [o_video_skipFrames_ckb setTitle: _NS("Skip frames")];
-    [o_video_snap_box setTitle: _NS("Video snapshots")];
@@ -308 +308 @@
-{
-    module_config_t *p_item;
+    vlc_list_t *p_list;
+    module_t *p_parser;
-    int i, y = 0;
-    char *psz_tmp;
@@ -324 +326 @@
-        [object selectItemAtIndex: p_item->value.i]; \
-    else \
-
+
+
-
-    #define SetupStringList( object, name ) \
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        { \
-
-
-
+
+
+
+
-        } \
-
+
+
+
-
-    /**********************
@@ -367 +391 @@
-        [o_audio_norm_ckb setState: (int)strstr( psz_tmp, "normvol" )];
-    [o_audio_norm_fld setFloatValue: config_GetFloat( p_intf, "norm-max-level" )];
-
-
-
-
+
+
+
-    /* Last.FM is optional */
-    if( module_Exists( p_intf, "audioscrobbler" ) )
@@ -392 +415 @@
-    [o_video_black_ckb setState: config_GetInt( p_intf, "macosx-black" )];
-
-
+
+
+
+
-
-    if( config_GetPsz( p_intf, "snapshot-path" ) != NULL )
@@ -579 +605 @@
-{
-    module_config_t *p_item;
+    vlc_list_t *p_list;
+    module_t *p_parser;
-    char *psz_tmp;
-    int i;
@@ -596 +624 @@
-        config_PutPsz( p_intf, name, strdup( [[VLCMain sharedInstance] delocalizeString: [object stringValue]] ) )
-
+#define SaveModuleList( object, name ) \
+    p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
+    \
+    p_list = vlc_list_find( VLCIntf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); \
+    for( int i_module_index = 0; i_module_index < p_list->i_count; i_module_index++ ) \
+    { \
+        p_parser = (module_t *)p_list->p_values[i_module_index].p_object; \
+        \
+        if( p_item->i_type == CONFIG_ITEM_MODULE && module_IsCapable( p_parser, p_item->psz_type ) ) \
+        { \
+            if( [[[object selectedItem] title] isEqualToString: _NS( module_GetLongName( p_parser ) )] ) \
+            { \
+                config_PutPsz( p_intf, name, strdup( module_GetObjName( p_parser ))); \
+                break; \
+            } \
+        } \
+    } \
+    vlc_list_release( p_list ); \
+    if( [[[object selectedItem] title] isEqualToString: _NS( "Default" )] ) \
+        config_PutPsz( p_intf, name, "Default" )
+
-    /**********************
-     * interface settings *
@@ -653 +702 @@
-        config_PutFloat( p_intf, "norm-max-level", [o_audio_norm_fld floatValue] );
-
-msg_Warn( p_intf, "visualizer not implemented!
+SaveModuleList( o_audio_visual_pop, "audio-visual
-
-        /* Last.FM is optional */
@@ -691 +740 @@
-        config_PutInt( p_intf, "macosx-black", [o_video_black_ckb state] );
-
-
+
+
-
-        config_PutPsz( p_intf, "snapshot-path", [[o_video_snap_folder_fld stringValue] UTF8String] );