From: Felix Paul Kühne Date: Thu, 30 Jul 2009 15:09:56 +0000 (+0200) Subject: macosx: forward-port recent preferences and media keys enhancements X-Git-Tag: 1.1.0-ff~4707 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5879ef30641efc0cf280caff430b63f117dd20e5;p=vlc macosx: forward-port recent preferences and media keys enhancements This includes [eb241138f52e7fbf1e83b07791bad007e2c2f3c6], [fb5108db888105b7fd07f89aaee5eb979ec8be15], [b8d90e93024e3e3f816f6a37d4c8933cdbbc8592], [acb8baa1e5e0d490353d92bbc1cf5902a3bdd792]. Regrettably, these weren't cherry-pickable. --- diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib index 5d49da6877..7d3b4fdfeb 100644 --- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib +++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib @@ -9,9 +9,9 @@ YES + - YES @@ -26,18 +26,18 @@ YES - + YES - + VLCApplication - + FirstResponder - + NSApplication - + 9 2 {{531, 256}, {640, 500}} @@ -48,31 +48,31 @@ View {3.40282e+38, 3.40282e+38} - + 256 YES - - + + 274 YES - - + + 276 YES - - + + 2304 YES - - + + 256 {154, 392} - + YES @@ -81,7 +81,7 @@ YES - + 1.510000e+02 1.600000e+01 1.000000e+03 @@ -98,40 +98,40 @@ 3 MC4zMzMzMzI5OQA - + 6 System headerTextColor - + 3 MAA - + 338820672 1024 - - + + 3 MQA - + 6 System controlTextColor - + 3 YES - + 3.000000e+00 2.000000e+00 - + 1 MC44MDAwMDAwMSAwLjA4OTE4MDkzOSAwLjA2MzEzMTQ3NAA @@ -145,82 +145,82 @@ {{1, 1}, {154, 392}} - - - - + + + + 6 System controlBackgroundColor - + 3 MC42NjY2NjY2OQA 4 - - + + -2147483392 {{144, 1}, {11, 381}} - + 256 - + _doScroller: 9.687500e-01 - - + + -2147483392 {{1, 382}, {143, 11}} - + 257 - + _doScroller: 9.058824e-01 {156, 394} - - + + 562 - - - + + + QSAAAEEgAABBmAAAQZgAAA - - + + 275 {{165, 0}, {447, 394}} - + NSScrollView NSView {{12, 68}, {612, 394}} - + YES - - + + 289 {{510, 13}, {120, 32}} - + YES - + 67239424 137887744 Save - + LucidaGrande 1.300000e+01 1044 - + -2038284033 1 - + Helvetica 1.300000e+01 16 @@ -231,21 +231,21 @@ 25 - - + + 289 {{270, 13}, {120, 32}} - + YES - + 67239424 137887744 Reset All - - + + -2038284033 1 - + @@ -256,96 +256,96 @@ 25 - - + + 289 {{390, 13}, {120, 32}} - + YES - + 67239424 137887744 Cancel - - + + -2038284033 1 - + Gw 200 25 - - + + 270 {{9, 470}, {606, 17}} - + YES - + 67239424 272629760 VLC media player preferences - - + + YES - + 6 System controlColor - + - + - - + + 292 YES - - + + 256 YES - - + + 256 {{14, 9}, {130, 18}} - + YES 1 2 YES - + 67239424 0 Basic - - + + 1211912703 0 - + NSRadioButton - + - + 200 25 - + -2080244224 0 All - - + + 1211912703 0 - + 400 @@ -356,11 +356,11 @@ {4, 2} 1143472128 NSActionCell - + 67239424 0 Radio - + 1211912703 0 @@ -467,46 +467,46 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA4AA - + 3 MCAwAA - + 400 75 1 - - - - + + + + {{2, 2}, {150, 39}} - + {{9, 10}, {154, 43}} - + {0, 0} 67239424 0 Show Settings - + 6 System textBackgroundColor - + 3 MCAwLjgwMDAwMDAxAA - + 3 0 0 @@ -520,10 +520,10 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA4AA {3.40282e+38, 3.40282e+38} prefs - + VLCPrefs - + 1 2 {{13, 650}, {570, 63}} @@ -534,63 +534,63 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA4AA View {3.40282e+38, 3.40282e+38} - + 256 YES - - + + 288 YES - - + + 256 YES - - + + 292 YES - - + + 256 YES - - + + 256 {{14, 9}, {130, 18}} - + YES 1 2 YES - + -2080244224 0 Basic - - + + 1211912703 0 - - + + - + 200 25 - + 67239424 0 All - - + + 1211912703 0 @@ -697,9 +697,9 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA - + - + 400 75 @@ -708,11 +708,11 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA {4, 2} 1143472128 NSActionCell - + 67239424 0 Radio - + 1211912703 0 @@ -754,99 +754,99 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - + - + 400 75 - - - - + + + + {{2, 2}, {150, 39}} - + {{10, 9}, {154, 43}} - + {0, 0} 67239424 0 Show Settings - + 3 MCAwLjgwMDAwMDAxAA - + 3 0 0 NO - - + + 256 {{440, 13}, {120, 32}} - + YES - + 67239424 134217728 Save - - + + -2038284033 1 - + DQ 200 25 - - + + 256 {{320, 13}, {120, 32}} - + YES - + 67239424 134217728 Cancel - - + + -2038284033 1 - + Gw 200 25 - - + + 256 {{163, 13}, {120, 32}} - + YES - + 67239424 134217728 Reset All - - + + -2038284033 1 - + fw 200 @@ -855,11 +855,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {570, 63} - + {570, 63} - + {0, 0} 67239424 @@ -870,13 +870,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1.100000e+01 16 - + 3 MCAwLjgwMDAwMDAxAA - + 0 3 0 @@ -890,25 +890,26 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {3.40282e+38, 3.40282e+38} sprefs - + 256 YES - - + + 256 {{133, 214}, {238, 26}} - + + YES - + -2076049856 2048 - - + + 109199615 1 - + LucidaGrande 1.300000e+01 16 @@ -919,53 +920,53 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 400 75 - - + + Item1 1048576 2147483647 1 - + NSImage NSMenuCheckmark - + NSImage NSMenuMixedState _popUpItemAction: - + YES - + OtherViews YES - - - + + + Item2 1048576 2147483647 - - + + _popUpItemAction: - + - - + + Item3 1048576 2147483647 - - + + _popUpItemAction: - + @@ -975,93 +976,95 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 - - + + 256 {{17, 220}, {114, 17}} - + + YES - + 67239424 272629760 Language - - - - + + + + - - + + 256 YES - - + + 256 YES - - + + 256 {{226, 7}, {293, 26}} - + + YES - + -2076049856 2048 - - + + 109199615 1 - + 400 75 - - + + Manual download only 1048576 2147483647 1 - - + + _popUpItemAction: - + YES - + OtherViews YES - - - + + + When track starts playing 1048576 2147483647 - - + + _popUpItemAction: - + - - + + As soon as track is added 1048576 2147483647 - - + + _popUpItemAction: - + @@ -1071,66 +1074,70 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 - - + + 256 {{13, 13}, {211, 17}} - + + YES - + 67239424 272629760 Album art download policy - - - - + + + + {{2, 2}, {532, 41}} - + + {{17, 16}, {536, 58}} - + + {0, 0} 67239424 0 Privacy / Network Interaction - + 3 MCAwLjgwMDAwMDAxAA - + 3 0 2 NO - - + + 256 {{18, 182}, {352, 18}} - + + YES - + 67239424 0 Show Fullscreen Controller - - + + 1211912703 2 - + NSImage NSSwitch - + NSSwitch @@ -1139,88 +1146,92 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 25 - - + + 256 {{18, 157}, {352, 18}} - + + YES - + 67239424 0 Add controls to the video window - - + + 1211912703 2 - - + + 200 25 - - + + 256 {{18, 130}, {352, 18}} - + + YES - + 67239424 0 Control playback with the Apple Remote - - + + 1211912703 2 - - + + 200 25 - - + + 256 {{18, 105}, {352, 18}} - + + YES - + 67239424 0 Control playback with media keys - - + + 1211912703 2 - - + + 200 25 - - + + 256 {{32, 81}, {352, 18}} - + + YES - + 67239424 0 ...when VLC is in background - - + + 1211912703 2 - - + + 200 @@ -1230,71 +1241,72 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {570, 258} + NSView NSResponder - + 256 YES - - + + 256 {{18, 424}, {246, 18}} - + YES - + 67239424 0 Enable Audio - - + + 1211912703 2 - - + + 200 25 - - + + 256 YES - - + + 256 YES - - + + 256 {{9, 107}, {181, 17}} - + YES - + 67239424 272629760 Default Volume - - - - + + + + - - + + 256 {{250, 102}, {198, 21}} - + YES - + 67239424 0 @@ -1305,7 +1317,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1.200000e+01 16 - + 4.000000e+02 0.000000e+00 5.000000e+01 @@ -1316,13 +1328,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO - - + + 256 {{465, 104}, {46, 22}} - + YES - + -1804468671 138413056 @@ -1333,8 +1345,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 BQAAAAAAAAAAAAAAAAAAAA - - + + YES @@ -1353,9 +1365,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + 0% - + YES YES @@ -1366,9 +1378,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA , - + . - + 2 1 NO @@ -1376,7 +1388,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 BAAAAAAAAAAAAAAAAAAAAA - + 0 0 NO @@ -1393,16 +1405,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - + NaN - + - - + + , . @@ -1410,116 +1422,116 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES YES - + YES - - + + 6 System textColor - + - - + + 256 {{10, 77}, {446, 18}} - + YES - + 67239424 0 Use S/PDIF when available - - + + 1211912703 2 - - + + 200 25 - - + + 256 {{9, 49}, {238, 17}} - + YES - + 67239424 272629760 Force detection of Dolby Surround - - - - + + + + - - + + 256 {{249, 43}, {185, 26}} - + YES - + -2076049856 2048 - - + + 109199615 1 - + 400 75 - - + + Auto 1048576 2147483647 1 - - + + _popUpItemAction: - + YES - + OtherViews YES - - - + + + On 1048576 2147483647 - - + + _popUpItemAction: - + - - + + Off 1048576 2147483647 - - + + _popUpItemAction: - + @@ -1529,125 +1541,125 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 - - + + 256 {{9, 14}, {238, 17}} - + YES - + 67239424 272629760 Preferred Audio language - - - - + + + + - - + + 256 {{252, 12}, {259, 22}} - + YES - + -1804468671 272630784 - - + + YES - - + + {{2, 2}, {531, 138}} - + {{17, 263}, {535, 155}} - + {0, 0} 67239424 0 General Audio - + 3 MCAwLjgwMDAwMDAxAA - + 3 0 2 NO - - + + 256 YES - - + + 256 YES - - + + 256 {{10, 72}, {446, 18}} - + YES - + 67239424 0 Headphone surround effect - - + + 1211912703 2 - - + + 200 25 - - + + 256 {{10, 42}, {238, 18}} - + YES - + 67239424 0 Volume normalizer - - + + 1211912703 2 - - + + 200 25 - - + + 256 {{252, 40}, {46, 22}} - + YES - + -1267597759 71304192 @@ -1658,8 +1670,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 BQAAAAAAAAAAAAAAAAAAAA - - + + YES @@ -1678,17 +1690,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + 0 - + , - + . de_DE - + 0 0 NO @@ -1705,15 +1717,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - + NaN - + - + 0 0 @@ -1729,105 +1741,105 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES YES - + YES - - + + - - + + 256 {{303, 37}, {19, 27}} - + YES - + 537787936 0 - + 5.900000e+01 1.000000e+00 YES YES - - + + 256 {{9, 14}, {238, 17}} - + YES - + 67239424 272629760 Visualization - - - - + + + + - - + + 256 {{249, 9}, {185, 26}} - + YES - + -2076049856 2048 - - + + 109199615 1 - + 400 75 - - + + Default 1048576 2147483647 1 - - + + _popUpItemAction: - + YES - + OtherViews YES - - - + + + Goom effect 1048576 2147483647 - - + + _popUpItemAction: - + - - + + Visualizer filter 1048576 2147483647 - - + + _popUpItemAction: - + @@ -1839,147 +1851,147 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{2, 2}, {531, 100}} - + {{17, 142}, {535, 117}} - + {0, 0} 67239424 0 Effects - + 3 MCAwLjgwMDAwMDAxAA - + 3 0 2 NO - - + + 256 YES - - + + 256 YES - - + + 256 {{14, 78}, {446, 18}} - + YES - + 67239424 0 Enable Last.fm submissions - - + + 1211912703 2 - - + + 200 25 - - + + 256 {{204, 50}, {307, 22}} - + YES - + -1267597759 272630784 - - + + YES - - + + - - + + 256 {{13, 20}, {186, 17}} - + YES - + 67239424 272629760 Password - - - - + + + + - - + + 256 {{204, 18}, {307, 22}} - + YES - + -1267597759 272630784 - - + + YES - - + + - - + + 256 {{13, 52}, {186, 17}} - + YES - + 67239424 272629760 User name - - - - + + + + {{2, 2}, {531, 105}} - + {{17, 16}, {535, 122}} - + {0, 0} 67239424 0 Last.fm - + 3 MCAwLjgwMDAwMDAxAA - + 3 0 2 @@ -1990,195 +2002,195 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSView NSResponder - + VLCSimplePrefs - - + + 256 YES - - + + 256 {{18, 311}, {352, 18}} - + YES - + 67239424 0 Enable Video - - + + 1211912703 2 - - + + 200 25 - - + + 256 YES - - + + 256 YES - - + + 256 {{14, 82}, {248, 18}} - + YES - + 67239424 0 Always on top - - + + 1211912703 2 - - + + 200 25 - - + + 256 {{14, 107}, {248, 18}} - + YES - + 67239424 0 Fullscreen - - + + 1211912703 2 - - + + 200 25 - - + + 256 {{270, 107}, {248, 18}} - + YES - + 67239424 0 Black screens in Fullscreen mode - - + + 1211912703 2 - - + + 200 25 - - + + 256 {{270, 82}, {248, 18}} - + YES - + 67239424 0 Skip frames - - + + 1211912703 2 - - + + 200 25 - - + + 256 {{182, 35}, {258, 26}} - + YES - + -2076049856 2048 - - + + 109199615 1 - + 400 75 - - + + OpenGL video output module 1048576 2147483647 1 - - + + _popUpItemAction: - + YES - + OtherViews YES - - - + + + Item2 1048576 2147483647 - - + + _popUpItemAction: - + - - + + Item3 1048576 2147483647 - - + + _popUpItemAction: - + @@ -2188,83 +2200,83 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 - - + + 256 {{13, 42}, {167, 17}} - + YES - + 67239424 272629760 Output module - - - - + + + + - - + + 256 {{182, 7}, {258, 26}} - + YES - + -2076049856 2048 - - + + 109199615 1 - + 400 75 - - + + Screen 1 (1280 * 800) 1048576 2147483647 1 - - + + _popUpItemAction: - + YES - + OtherViews YES - - - + + + Item2 1048576 2147483647 - - + + _popUpItemAction: - + - - + + Item3 1048576 2147483647 - - + + _popUpItemAction: - + @@ -2274,105 +2286,105 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 - - + + 256 {{13, 14}, {167, 17}} - + YES - + 67239424 272629760 VmlkZW9nZXLDpHQgZsO8ciBWb2xsYmlsZA - - - - + + + + {{2, 2}, {532, 134}} - + {{17, 144}, {536, 151}} - + {0, 0} 67239424 0 Display - + 3 MCAwLjgwMDAwMDAxAA - + 3 0 2 NO - - + + 256 YES - - + + 256 YES - - + + 256 {{80, 67}, {305, 22}} - + YES - + -1804468671 272630784 - - + + YES - - + + - - + + 256 {{13, 70}, {62, 17}} - + YES - + 67239424 272629760 Folder - - - - + + + + - - + + 256 {{387, 61}, {135, 32}} - + YES - + 67239424 134217728 Browse... - - + + -2038284033 1 - + @@ -2381,127 +2393,127 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 25 - - + + 256 {{80, 40}, {209, 22}} - + YES - + -1804468671 272630784 vlcsnap- - - + + YES - - + + - - + + 256 {{13, 43}, {62, 17}} - + YES - + 67239424 272629760 Prefix - - - - + + + + - - + + 256 {{295, 43}, {223, 18}} - + YES - + 67239424 0 Sequential numbering - - + + 1211912703 2 - - + + 200 25 - - + + 256 {{13, 14}, {62, 17}} - + YES - + 67239424 272629760 Format - - - - + + + + - - + + 256 {{77, 8}, {215, 26}} - + YES - + -2076049856 2048 - - + + 109199615 1 - + 400 75 - - + + PNG 1048576 2147483647 1 - - + + _popUpItemAction: - + YES - + OtherViews YES - - - + + + JPEG 1048576 2147483647 - - + + _popUpItemAction: - + @@ -2513,24 +2525,24 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{2, 2}, {532, 99}} - + {{17, 16}, {536, 116}} - + {0, 0} 67239424 0 Video snapshots - + 3 MCAwLjgwMDAwMDAxAA - + 3 0 2 @@ -2538,40 +2550,41 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {570, 347} + NSView NSResponder - + 256 YES - - + + 256 YES - - + + 256 YES - - + + 256 {{14, 9}, {304, 18}} - + YES - + 67239424 0 Enable OSD - - + + 1211912703 2 - - + + 200 @@ -2580,110 +2593,110 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{2, 2}, {532, 36}} - + {{17, 228}, {536, 53}} - + {0, 0} 67239424 0 On Screen Display - + 3 MCAwLjgwMDAwMDAxAA - + 3 0 2 NO - - + + 256 YES - - + + 256 YES - - + + 256 {{13, 41}, {235, 17}} - + YES - + 67239424 272629760 Preferred Subtitle Language - - - - + + + + - - + + 256 {{253, 39}, {259, 22}} - + YES - + -1804468671 272630784 - - + + YES - - + + - - + + 256 {{13, 13}, {235, 17}} - + YES - + 67239424 272629760 Default Encoding - - - - + + + + - - + + 256 {{250, 7}, {265, 26}} - + YES - + -2076049856 2048 - - + + 109199615 1 - + 400 75 - - + + YES YES @@ -2691,51 +2704,51 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1048576 2147483647 1 - - + + _popUpItemAction: - + YES - + OtherViews YES - - + + Default 1048576 2147483647 - - + + _popUpItemAction: - + - - - + + + UTF-8 1048576 2147483647 - - + + _popUpItemAction: - + - - + + Item3 1048576 2147483647 - - + + _popUpItemAction: - + @@ -2748,87 +2761,87 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{2, 2}, {532, 70}} - + {{17, 137}, {536, 87}} - + {0, 0} 67239424 0 Subtitle Languages - + 3 MCAwLjgwMDAwMDAxAA - + 3 0 2 NO - - + + 256 YES - - + + 256 YES - - + + 256 {{133, 69}, {252, 22}} - + YES - + -2072904127 272630784 - - + + YES - - + + - - + + 256 {{13, 71}, {62, 17}} - + YES - + 67239424 272629760 Font - - - - + + + + - - + + 256 {{387, 62}, {135, 32}} - + YES - + 67239424 134217728 Choose... - - + + -2038284033 1 - + @@ -2837,67 +2850,67 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 25 - - + + 256 {{130, 37}, {258, 26}} - + YES - + -2076049856 2048 - - + + 109199615 1 - + 400 75 - - + + Item1 1048576 2147483647 1 - - + + _popUpItemAction: - + YES - + OtherViews YES - - - + + + Item2 1048576 2147483647 - - + + _popUpItemAction: - + - - + + Item3 1048576 2147483647 - - + + _popUpItemAction: - + @@ -2907,83 +2920,83 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 - - + + 256 {{13, 43}, {115, 17}} - + YES - + 67239424 272629760 Font Size - - - - + + + + - - + + 256 {{130, 7}, {258, 26}} - + YES - + -2076049856 2048 - - + + 109199615 1 - + 400 75 - - + + Item1 1048576 2147483647 1 - - + + _popUpItemAction: - + YES - + OtherViews YES - - - + + + Item2 1048576 2147483647 - - + + _popUpItemAction: - + - - + + Item3 1048576 2147483647 - - + + _popUpItemAction: - + @@ -2993,42 +3006,42 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 - - + + 256 {{13, 13}, {115, 17}} - + YES - + 67239424 272629760 Font Color - - - - + + + + {{2, 2}, {532, 100}} - + {{17, 16}, {536, 117}} - + {0, 0} 67239424 0 Display Settings - + 3 MCAwLjgwMDAwMDAxAA - + 3 0 2 @@ -3041,28 +3054,28 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSResponder - + 256 YES - - + + 256 YES - - + + 256 YES - - + + 256 {{222, 82}, {58, 22}} - + YES - + -1804468671 71304192 @@ -3073,8 +3086,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 0gQAAAAAAAAAAAAAAAAAAA - - + + YES @@ -3094,17 +3107,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + 0 - + . - + , - + - + 4 1 NO @@ -3112,7 +3125,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 AQAAAAAAAAAAAAAAAAAAAA - + 0 0 NO @@ -3129,16 +3142,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - + NaN - + - - + + . , @@ -3146,22 +3159,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO YES - + YES - - + + - - + + 256 {{285, 79}, {19, 27}} - + YES - + 917024 0 - + 1.000000e+00 1.000000e+00 1.000000e+04 @@ -3170,130 +3183,130 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - - + + 256 {{13, 85}, {204, 17}} - + YES - + 67239424 272629760 Default Server Port - - - - + + + + - - + + 256 {{13, 52}, {204, 17}} - + YES - + 67239424 272629760 HTTP Proxy - - - - + + + + - - + + 256 {{222, 50}, {290, 22}} - + YES - + -1804468671 272630784 - - + + YES - - + + - - + + 256 {{14, 24}, {204, 17}} - + YES - + 67239424 272629760 Password for HTTP Proxy - - - - + + + + - - + + 256 {{222, 22}, {290, 22}} - + YES - + -1804468671 272630784 - - + + YES - - + + {{2, 2}, {532, 114}} - + {{17, 251}, {536, 131}} - + {0, 0} 67239424 0 Network - + 3 MCAwLjgwMDAwMDAxAA - + 3 0 2 NO - - + + 256 YES - - + + 256 YES - - + + 256 {{320, 97}, {58, 22}} - + YES - + -1804468671 71304192 @@ -3304,8 +3317,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 0gQAAAAAAAAAAAAAAAAAAA - - + + YES @@ -3325,15 +3338,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + 0 - + . - + , - - + + 0 1 NO @@ -3341,7 +3354,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 CAAAAAAAAAAAAAAAAAAAAA - + 0 0 NO @@ -3358,16 +3371,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - + NaN - + - - + + . , @@ -3375,121 +3388,121 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO YES - + YES - - + + - - + + 256 {{383, 94}, {19, 27}} - + YES - + 917024 0 - + 8.000000e+00 1.000000e+00 YES YES - - + + 256 {{13, 100}, {246, 17}} - + YES - + 67239424 272629760 Post-Processing Quality - - - - + + + + - - + + 256 {{13, 68}, {246, 17}} - + YES - + 67239424 272629760 Repair AVI Files - - - - + + + + - - + + 256 {{317, 62}, {202, 26}} - + YES - + -2076049856 2048 - - + + 109199615 1 - + 400 75 - - + + Item1 1048576 2147483647 1 - - + + _popUpItemAction: - + YES - + OtherViews YES - - - + + + Item2 1048576 2147483647 - - + + _popUpItemAction: - + - - + + Item3 1048576 2147483647 - - + + _popUpItemAction: - + @@ -3499,104 +3512,104 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 - - + + 256 {{14, 36}, {256, 18}} - + YES - + 67239424 0 Use RTP over RTSP (TCP) - - + + 1211912703 2 - + 200 25 - - + + 256 {{13, 12}, {302, 17}} - + YES - + 67239424 272629760 Skip the Loop filter for H.264 decoding - - - - + + + + - - + + 256 {{317, 6}, {202, 26}} - + YES - + -2076049856 2048 - - + + 109199615 1 - + 400 75 - - + + Item1 1048576 2147483647 1 - - + + _popUpItemAction: - + YES - + OtherViews YES - - - + + + Item2 1048576 2147483647 - - + + _popUpItemAction: - + - - + + Item3 1048576 2147483647 - - + + _popUpItemAction: - + @@ -3608,100 +3621,100 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{2, 2}, {532, 131}} - + {{17, 16}, {536, 148}} - + {0, 0} 67239424 0 Codecs / Muxers - + 3 MCAwLjgwMDAwMDAxAA - + 3 0 2 NO - - + + 256 YES - - + + 256 YES - - + + 256 {{317, 27}, {202, 26}} - + YES - + -2076049856 2048 - - + + 109199615 1 - + 400 75 - - + + Item1 1048576 2147483647 1 - - + + _popUpItemAction: - + YES - + OtherViews YES - - - + + + Item2 1048576 2147483647 - - + + _popUpItemAction: - + - - + + Item3 1048576 2147483647 - - + + _popUpItemAction: - + @@ -3711,29 +3724,29 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 - - + + 256 {{14, 33}, {301, 17}} - + YES - + 67239424 272629760 Default Caching Level - - - - + + + + - - + + 268 {{14, 13}, {504, 12}} - + YES - + 67239424 272629760 Use the complete preferences to configure custom caching values for each access module. @@ -3742,31 +3755,31 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 9.000000e+00 3614 - - - + + + {{2, 2}, {532, 62}} - + {{17, 168}, {536, 79}} - + {0, 0} 67239424 0 Caching - + 3 MCAwLjgwMDAwMDAxAA - + 3 0 2 @@ -3778,42 +3791,42 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSView NSResponder - + 256 YES - - + + 256 {{17, 378}, {536, 17}} - + YES - + 67239424 272629760 Select an action to change the associated hotkey: - - - - + + + + - - + + 256 {{14, 12}, {138, 32}} - + YES - + 67239424 134217728 Clear - - + + -2038284033 1 - + @@ -3822,59 +3835,59 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 25 - - + + 256 {{418, 12}, {138, 32}} - + YES - + 67239424 134217728 Change - - + + -2038284033 1 - + DQ 200 25 - - + + 256 YES - - + + 2304 YES - - + + 256 {528, 292} - + YES - - + + 256 {528, 17} - - + + - - + + -2147483392 {{-26, 0}, {16, 17}} - + YES - + action 2.930000e+02 4.000000e+01 @@ -3884,26 +3897,26 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 0 Action - + 3 MC4zMzMzMzI5OQA - + - + 337772096 2048 - - - - + + + + 3 YES YES - + - + shortcut 2.136982e+02 8.000000e+00 @@ -3913,26 +3926,26 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 0 Shortcut - - + + - + 337772096 2048 - - - - + + + + 3 YES YES - + 3.000000e+00 2.000000e+00 - + 6 System @@ -3952,55 +3965,55 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 17}, {528, 292}} - - - - + + + + 4 - - + + -2147483392 {{514, 17}, {15, 277}} - - + + _doScroller: 9.486302e-01 - - + + -2147483392 {{1, 294}, {528, 15}} - + 1 - + _doScroller: 9.962264e-01 - - + + 2304 YES - + {{1, 0}, {528, 17}} - - - - + + + + 4 - + {{20, 60}, {530, 310}} - - + + 562 - - - - + + + + AAAAAAAAAABBmAAAQZgAAA @@ -4010,7 +4023,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSResponder - + 1 2 {{433, 441}, {440, 170}} @@ -4021,34 +4034,34 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA View {3.40282e+38, 3.40282e+38} - + 256 YES - - + + 256 {{17, 116}, {406, 34}} - + YES - + 67239424 138412032 UHJlc3MgbmV3IGtleXMgZm9yCiVzA - - - - + + + + - - + + 256 {{17, 90}, {406, 18}} - + YES - + 67239424 138412032 ${PRESSED_KEYS} @@ -4057,24 +4070,24 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1.400000e+01 16 - - - + + + - - + + 268 {{17, 54}, {406, 28}} - + YES - + 67239424 138543104 This combination is already taken by %s - - + + 6 System @@ -4086,42 +4099,42 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - - + + 256 {{198, 12}, {114, 32}} - + YES - + 67239424 134217728 Cancel - - + + -2038284033 1 - + 200 25 - - + + 256 {{312, 12}, {114, 32}} - + YES - + 67239424 134217728 OK - - + + -2038284033 1 - + 200 @@ -4141,1499 +4154,1547 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA o_reset_btn - - + + 1545 o_cancel_btn - - + + 1547 o_prefs_view - - + + 1548 o_tree - - + + 1549 o_save_btn - - + + 1550 o_prefs_window - - + + 1551 resetAll: - - + + 1552 closePrefs: - - + + 1553 savePrefs: - - + + 1554 dataSource - - + + 1557 delegate - - + + 1558 o_title - - + + 2262 takeFloatValueFrom: - - + + 2355 o_audio_view - - + + 2371 o_intf_view - - + + 2372 o_sprefs_win - - + + 2373 o_audio_enable_ckb - - + + 2374 o_audio_general_box - - + + 2375 o_audio_vol_txt - - + + 2376 o_audio_vol_sld - - + + 2377 o_audio_vol_fld - - + + 2378 o_audio_dolby_txt - - + + 2379 o_audio_dolby_pop - - + + 2380 o_audio_effects_box - - + + 2381 o_audio_headphone_ckb - - + + 2382 o_audio_lang_txt - - + + 2383 o_audio_lang_fld - - + + 2384 o_audio_last_box - - + + 2385 o_audio_last_ckb - - + + 2386 o_audio_lastpwd_txt - - + + 2387 o_audio_lastuser_fld - - + + 2389 o_audio_lastuser_txt - - + + 2390 o_audio_norm_ckb - - + + 2391 o_audio_norm_fld - - + + 2392 o_audio_spdif_ckb - - + + 2393 o_audio_visual_pop - - + + 2394 o_audio_visual_txt - - + + 2395 o_intf_art_pop - - + + 2396 o_intf_art_txt - - + + 2397 o_intf_fspanel_ckb - - + + 2400 o_intf_lang_pop - - + + 2401 o_intf_lang_txt - - + + 2402 o_intf_network_box - - + + 2404 o_sprefs_reset_btn - - + + 2405 o_sprefs_basic_box - - + + 2406 o_sprefs_cancel_btn - - + + 2408 o_sprefs_save_btn - - + + 2409 buttonAction: - - + + 2415 buttonAction: - - + + 2416 buttonAction: - - + + 2417 interfaceSettingChanged: - - + + 2418 interfaceSettingChanged: - - + + 2419 interfaceSettingChanged: - - + + 2422 audioSettingChanged: - - + + 2424 audioSettingChanged: - - + + 2426 audioSettingChanged: - - + + 2427 audioSettingChanged: - - + + 2428 audioSettingChanged: - - + + 2429 audioSettingChanged: - - + + 2430 audioSettingChanged: - - + + 2431 audioSettingChanged: - - + + 2432 audioSettingChanged: - - + + 2433 audioSettingChanged: - - + + 2434 audioSettingChanged: - - + + 2435 audioSettingChanged: - - + + 2436 o_sprefs_basicFull_matrix - - + + 2438 o_sprefs_controls_box - - + + 2439 audioSettingChanged: - - + + 2444 interfaceSettingChanged: - - + + 2446 o_intf_embedded_ckb - - + + 2447 o_video_enable_ckb - - + + 2489 o_video_black_ckb - - + + 2490 o_video_device_pop - - + + 2491 o_video_device_txt - - + + 2492 o_video_display_box - - + + 2493 o_video_fullscreen_ckb - - + + 2494 o_video_onTop_ckb - - + + 2495 o_video_output_pop - - + + 2496 o_video_output_txt - - + + 2497 o_video_skipFrames_ckb - - + + 2499 o_video_snap_box - - + + 2500 o_video_snap_folder_btn - - + + 2501 o_video_snap_folder_txt - - + + 2503 o_video_snap_format_txt - - + + 2505 o_video_snap_prefix_fld - - + + 2506 o_video_snap_prefix_txt - - + + 2507 o_video_snap_seqnum_ckb - - + + 2508 videoSettingChanged: - - + + 2509 videoSettingChanged: - - + + 2510 videoSettingChanged: - - + + 2511 videoSettingChanged: - - + + 2512 videoSettingChanged: - - + + 2513 videoSettingChanged: - - + + 2514 videoSettingChanged: - - + + 2515 videoSettingChanged: - - + + 2516 videoSettingChanged: - - + + 2517 videoSettingChanged: - - + + 2518 videoSettingChanged: - - + + 2519 videoSettingChanged: - - + + 2520 o_video_view - - + + 2521 o_video_snap_format_pop - - + + 2522 inputSettingChanged: - - + + 2608 inputSettingChanged: - - + + 2609 inputSettingChanged: - - + + 2610 inputSettingChanged: - - + + 2611 inputSettingChanged: - - + + 2612 inputSettingChanged: - - + + 2613 o_input_avi_pop - - + + 2619 o_input_avi_txt - - + + 2620 o_input_cachelevel_txt - - + + 2622 o_input_cachelevel_pop - - + + 2623 o_input_caching_box - - + + 2624 o_input_httpproxy_txt - - + + 2626 o_input_httpproxy_fld - - + + 2627 o_input_mux_box - - + + 2628 o_input_net_box - - + + 2629 o_input_postproc_fld - - + + 2630 o_input_postproc_txt - - + + 2631 o_input_rtsp_ckb - - + + 2633 o_input_serverport_fld - - + + 2634 o_input_serverport_txt - - + + 2635 o_osd_encoding_pop - - + + 2637 o_osd_encoding_txt - - + + 2638 o_osd_font_box - - + + 2639 o_osd_font_btn - - + + 2640 o_osd_font_color_pop - - + + 2641 o_osd_font_color_txt - - + + 2642 o_osd_font_fld - - + + 2645 o_osd_font_size_pop - - + + 2646 o_osd_font_size_txt - - + + 2647 o_osd_font_txt - - + + 2648 o_osd_lang_box - - + + 2649 o_osd_lang_fld - - + + 2650 o_osd_lang_txt - - + + 2651 o_osd_osd_box - - + + 2652 o_osd_osd_ckb - - + + 2653 o_input_view - - + + 2654 o_osd_view - - + + 2655 osdSettingChanged: - - + + 2656 osdSettingChanged: - - + + 2657 osdSettingChanged: - - + + 2658 osdSettingChanged: - - + + 2659 osdSettingChanged: - - + + 2661 osdSettingChanged: - - + + 2662 takeIntValueFrom: - - + + 2666 takeIntValueFrom: - - + + 2667 dataSource - - + + 2681 hotkeySettingChanged: - - + + 2682 hotkeySettingChanged: - - + + 2683 o_hotkeys_change_lbl - - + + 2685 o_hotkeys_change_btn - - + + 2686 o_hotkeys_change_win - - + + 2687 o_hotkeys_clear_btn - - + + 2688 o_hotkeys_lbl - - + + 2690 o_hotkeys_listbox - - + + 2691 o_hotkeys_view - - + + 2692 hotkeySettingChanged: - - + + 2795 hotkeySettingChanged: - - + + 2797 o_hotkeys_change_cancel_btn - - + + 2798 o_hotkeys_change_ok_btn - - + + 2799 o_hotkeys_change_keys_lbl - - + + 2802 o_hotkeys_change_taken_lbl - - + + 2923 o_input_cachelevel_custom_txt - - + + 3164 o_input_httpproxypwd_sfld - - + + 3288 o_input_httpproxypwd_txt - - + + 3289 - - - o_video_snap_folder_fld - - - - 3290 - o_audio_lastpwd_sfld - - + + 3291 inputSettingChanged: - - + + 3308 buttonAction: - - + + 3314 buttonAction: - - + + 3315 o_basicFull_matrix - - + + 3316 showFontPicker: - - + + 3418 o_audio_norm_stepper - - + + 3419 nextKeyView - - + + 3420 nextKeyView - - + + 3421 nextKeyView - - + + 3422 nextKeyView - - + + 3423 nextKeyView - - + + 3424 nextKeyView - - + + 3425 nextKeyView - - + + 3426 nextKeyView - - + + 3427 nextKeyView - - + + 3428 nextKeyView - - + + 3429 nextKeyView - - + + 3430 o_input_skipLoop_txt - - + + 3440 o_input_skipLoop_pop - - + + 3441 inputSettingChanged: - - + + 3442 + + + o_intf_mediakeys_bg_ckb + + + + 3548 + + + + o_intf_mediakeys_ckb + + + + 3549 + + + + o_intf_appleremote_ckb + + + + 3550 + + + + interfaceSettingChanged: + + + + 3551 + + + + interfaceSettingChanged: + + + + 3552 + + + + interfaceSettingChanged: + + + + 3553 + + + + o_video_snap_folder_fld + + + + 3554 + @@ -5643,2252 +5704,2252 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + -2 - + RmlsZSdzIE93bmVyA -1 - + First Responder 1530 - + YES - + Com. Preferences 1531 - + YES - - - - - - + + + + + + - + 1538 - + YES - - + + - + 1533 - + YES - - - + + + - + 1534 - + YES - + - + 1535 - + YES - + - + 1537 - - + + 1541 - + YES - + - + 1542 - + YES - + - + 1543 - + YES - + - + 2257 - + YES - + - + 3309 - + YES - + - + 1544 - + VLCPrefs 2265 - + YES - + Simple Preferences 2266 - + YES - + - + 2410 - + YES - - - - + + + + - + 2311 - + YES - - - - - - - - + + + + + + + + Interface 2312 - + YES - + - + 2317 - + YES - + - + 2318 - + YES - - + + - + 2327 - + YES - + - + 2445 - + YES - + - + 2330 - + YES - - - - + + + + Audio 2331 - + YES - + - + 2332 - + YES - - - - - - - - + + + + + + + + - + 2347 - + YES - - - - - - + + + + + + - + 2363 - + YES - - - - - + + + + + - + 2370 - + VLCSimplePrefs 2440 - + YES - - - + + + Video 2448 - + YES - + - + 2449 - + YES - - - - - - - - + + + + + + + + - + 2466 - + YES - - - - - - - - + + + + + + + + - + 2523 - + YES - - - + + + U3VidGl0bGVzICYgT1NEIFNldHRpbmdzA 2524 - + YES - + - + 2527 - + YES - - - - + + + + - + 2537 - + YES - - - - - - - + + + + + + + - + 2562 - + YES - - - + + + SW5wdXQgJiBDb2RlY3M 2563 - + YES - - - - - - - + + + + + + + - + 2572 - + YES - - - + + + - + 2585 - + YES - - - - - - - - + + + + + + + + - + 2668 - + YES - - - - + + + + Hotkeys 2669 - + YES - - - - + + + + - + 2670 - + YES - - + + - + 2671 - + YES - + - + 2672 - + YES - + - + 2673 - + YES - + - + 2674 - + YES - + - + 2675 - + YES - + - + 2677 - + YES - + Hotkey Changer 2678 - + YES - - - - - + + + + + - + 2679 - + YES - + - + 2791 - + YES - + - + 2792 - + YES - + - + 2800 - + YES - + - + 2803 - + YES - + - + 3444 - - + + 3445 - - + + 3446 - - + + 3447 - - + + 3451 - + YES - + - + 3452 - - + + 3455 - - + + 3456 - - + + 3457 - - + + 3477 - - + + 3524 - - + + 3525 - - + + 3526 - - + + 3527 - - + + 3528 - - + + 3529 - - + + 3530 - - + + 3531 - - + + 3534 - - + + 3535 - - + + 3536 - - + + 2313 - + YES - - - + + + - + 2316 - - + + 2315 - - + + 2314 - - + + 3537 - - + + 3538 - - + + 3539 - - + + 3540 - - + + 3541 - - + + -3 - + Application 3311 - + YES - - - + + + - + 3532 - - + + 3313 - - + + 3312 - - + + 2267 - + YES - + - + 2275 - + YES - + - + 3448 - - + + 2276 - + YES - + - + 3449 - - + + 2277 - + YES - + - + 3450 - - + + 2269 - + YES - - - + + + - + 2273 - - + + 2274 - - + + 3533 - - + + 2320 - + YES - + - + 3453 - + YES - + - + 2321 - + YES - - - + + + - + 2322 - - + + 2323 - - + + 2324 - - + + 2325 - + YES - + - + 3454 - - + + 2334 - + YES - + - + 3458 - - + + 2335 - + YES - + - + 3459 - - + + 2336 - + YES - + - + 3460 - + YES - + - + 2337 - - + + 2338 - + YES - + - + 3461 - - + + 2339 - + YES - + - + 3462 - - + + 2340 - + YES - + - + 3463 - + YES - + - + 2341 - + YES - - - + + + - + 2342 - - + + 2343 - - + + 2344 - - + + 2345 - + YES - + - + 3464 - - + + 2346 - + YES - + - + 3465 - - + + 2350 - + YES - + - + 3466 - - + + 2351 - + YES - + - + 3467 - - + + 2352 - + YES - + - + 3468 - + YES - + - + 2354 - - + + 2353 - + YES - + - + 3469 - - + + 2357 - + YES - + - + 3470 - - + + 2358 - + YES - + - + 3471 - + YES - + - + 2359 - + YES - - - + + + - + 2360 - - + + 2361 - - + + 2362 - - + + 2365 - + YES - + - + 3472 - - + + 2367 - + YES - + - + 3474 - - + + 2368 - + YES - + - + 3475 - - + + 2369 - + YES - + - + 3476 - - + + 2366 - + YES - + - + 3473 - - + + 2451 - + YES - + - + 3478 - - + + 2452 - + YES - + - + 3479 - - + + 2453 - + YES - + - + 3480 - - + + 2454 - + YES - + - + 3481 - - + + 2460 - + YES - + - + 3482 - + YES - + - + 2461 - + YES - - - + + + - + 2462 - - + + 2463 - - + + 2464 - - + + 2465 - + YES - + - + 3483 - - + + 2483 - + YES - + - + 3484 - + YES - + - + 2484 - + YES - - - + + + - + 2485 - - + + 2486 - - + + 2487 - - + + 2488 - + YES - + - + 3485 - - + + 2468 - + YES - + - + 3486 - - + + 2470 - + YES - + - + 3487 - - + + 2473 - + YES - + - + 3488 - - + + 2474 - + YES - + - + 3489 - - + + 2475 - + YES - + - + 3490 - - + + 2476 - + YES - + - + 3491 - - + + 2477 - + YES - + - + 3492 - - + + 2478 - + YES - + - + 3493 - + YES - + - + 2479 - + YES - - + + - + 2481 - - + + 2482 - - + + 2526 - + YES - + - + 3494 - - + + 2529 - + YES - + - + 3495 - - + + 2530 - + YES - + - + 3496 - - + + 2531 - + YES - + - + 3497 - - + + 2532 - + YES - + - + 3498 - + YES - + - + 2533 - + YES - - - - + + + + - + 2534 - - + + 2535 - - + + 2536 - - + + 2665 - - + + 2541 - + YES - + - + 3499 - - + + 2542 - + YES - + - + 3500 - - + + 2543 - + YES - + - + 3501 - - + + 2544 - + YES - + - + 3502 - + YES - + - + 2545 - + YES - - - + + + - + 2546 - - + + 2547 - - + + 2548 - - + + 2549 - + YES - + - + 3503 - - + + 2550 - + YES - + - + 3504 - + YES - + - + 2551 - + YES - - - + + + - + 2552 - - + + 2553 - - + + 2554 - - + + 2555 - + YES - + - + 3505 - - + + 2565 - + YES - + - + 3506 - + YES - + - + 2566 - - + + 2567 - + YES - + - + 3507 - - + + 2569 - + YES - + - + 3508 - - + + 2570 - + YES - + - + 3509 - - + + 2571 - + YES - + - + 3510 - - + + 3284 - + YES - + - + 3511 - - + + 3285 - + YES - + - + 3512 - - + + 2580 - + YES - + - + 3514 - + YES - + - + 2581 - + YES - - - + + + - + 2582 - - + + 2583 - - + + 2584 - - + + 2574 - + YES - + - + 3513 - - + + 3162 - + YES - + - + 3515 - - + + 2587 - + YES - + - + 3516 - + YES - + - + 2588 - - + + 2589 - + YES - + - + 3517 - - + + 2592 - + YES - + - + 3518 - - + + 2593 - + YES - + - + 3519 - - + + 2594 - + YES - + - + 3520 - + YES - + - + 2595 - + YES - - - + + + - + 2596 - - + + 2597 - - + + 2598 - - + + 2599 - + YES - + - + 3521 - - + + 3434 - + YES - + - + 3522 - - + + 3435 - + YES - + - + 3523 - + YES - + - + 3436 - + YES - - - + + + - + 3437 - - + + 3438 - - + + 3439 - - + + 3542 - + YES - + - + 3543 - + YES - + - + 3544 - + YES - + - + 3545 - - + + 3546 - - + + 3547 - - + + @@ -8046,6 +8107,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 2370.ImportedFromIB2 2410.IBPluginDependency 2410.ImportedFromIB2 + 2440.IBEditorWindowLastContentRect 2440.IBPluginDependency 2440.ImportedFromIB2 2445.IBPluginDependency @@ -8110,6 +8172,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 2487.ImportedFromIB2 2488.IBPluginDependency 2488.ImportedFromIB2 + 2523.IBEditorWindowLastContentRect 2523.IBPluginDependency 2523.ImportedFromIB2 2524.IBPluginDependency @@ -8342,7 +8405,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin - {{343, 407}, {570, 258}} + {{384, 139}, {570, 258}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -8446,6 +8509,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin + {{343, 203}, {570, 347}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -8510,6 +8574,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin + {{343, 272}, {570, 301}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -8715,7 +8780,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 3547 + 3554 @@ -8727,6 +8792,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + NSApplication + + IBProjectSource + ../../../modules/gui/macosx/applescript.h + + NSApplication @@ -8734,6 +8806,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + NSObject + + IBProjectSource + ../../../modules/gui/macosx/AppleRemote.h + + NSObject @@ -8741,6 +8820,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + VLCApplication + NSApplication + + IBProjectSource + ../../../modules/gui/macosx/intf.h + + VLCApplication NSApplication @@ -8749,6 +8836,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + VLCHotkeyChangeWindow + NSWindow + + IBProjectSource + ../../../modules/gui/macosx/simple_prefs.h + + VLCHotkeyChangeWindow NSWindow @@ -8802,6 +8897,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA id + + IBProjectSource + ../../../modules/gui/macosx/prefs.h + + + + VLCPrefs + NSObject IBUserSource @@ -8816,6 +8919,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES audioSettingChanged: buttonAction: + changeFont: hotkeySettingChanged: inputSettingChanged: interfaceSettingChanged: @@ -8833,6 +8937,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA id id id + id @@ -8863,6 +8968,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA o_audio_vol_fld o_audio_vol_sld o_audio_vol_txt + o_currentlyShownCategoryView o_hotkeys_change_btn o_hotkeys_change_cancel_btn o_hotkeys_change_keys_lbl @@ -8894,12 +9000,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA o_input_skipLoop_pop o_input_skipLoop_txt o_input_view + o_intf_appleremote_ckb o_intf_art_pop o_intf_art_txt o_intf_embedded_ckb o_intf_fspanel_ckb o_intf_lang_pop o_intf_lang_txt + o_intf_mediakeys_bg_ckb + o_intf_mediakeys_ckb o_intf_network_box o_intf_view o_osd_encoding_pop @@ -9054,13 +9163,27 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA id id id + id + id + id + id + + + + VLCSimplePrefs + NSObject IBUserSource + + VLCSimplePrefsWindow + NSWindow + + VLCSimplePrefsWindow NSWindow diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib index 3121fe0f4f..9be87c4d6b 100644 Binary files a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib differ diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index d5ca3d9708..fb0afba44a 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -431,6 +431,8 @@ struct intf_sys_t { BOOL b_justJumped; BOOL b_mediaKeySupport; + BOOL b_activeInBackground; + BOOL b_active; } - (void)coreChangedMediaKeySupportSetting: (NSNotification *)o_notification; diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 534965b22e..d177df7227 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -2862,8 +2862,11 @@ end: - (void)awakeFromNib { - b_mediaKeySupport = config_GetInt( VLCIntf, "macosx-mediakeys" ); + b_active = b_mediaKeySupport = config_GetInt( VLCIntf, "macosx-mediakeys" ); + b_activeInBackground = config_GetInt( VLCIntf, "macosx-mediakeys-background" ); [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(coreChangedMediaKeySupportSetting:) name: @"VLCMediaKeySupportSettingChanged" object: nil]; + [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(appGotActiveOrInactive:) name: @"NSApplicationDidBecomeActiveNotification" object: nil]; + [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(appGotActiveOrInactive:) name: @"NSApplicationWillResignActiveNotification" object: nil]; } - (void)dealloc @@ -2872,58 +2875,68 @@ end: [super dealloc]; } +- (void)appGotActiveOrInactive: (NSNotification *)o_notification +{ + if(( [[o_notification name] isEqualToString: @"NSApplicationWillResignActiveNotification"] && !b_activeInBackground ) || !b_mediaKeySupport) + b_active = NO; + else + b_active = YES; +} + - (void)coreChangedMediaKeySupportSetting: (NSNotification *)o_notification { - b_mediaKeySupport = config_GetInt( VLCIntf, "macosx-mediakeys" ); + b_active = b_mediaKeySupport = config_GetInt( VLCIntf, "macosx-mediakeys" ); + b_activeInBackground = config_GetInt( VLCIntf, "macosx-mediakeys-background" ); } + - (void)sendEvent: (NSEvent*)event { - if( b_mediaKeySupport ) + if( b_active ) { - if( [event type] == NSSystemDefined && [event subtype] == 8 ) - { - int keyCode = (([event data1] & 0xFFFF0000) >> 16); - int keyFlags = ([event data1] & 0x0000FFFF); - int keyState = (((keyFlags & 0xFF00) >> 8)) == 0xA; - int keyRepeat = (keyFlags & 0x1); - - if( keyCode == NX_KEYTYPE_PLAY && keyState == 0 ) - var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_PLAY_PAUSE ); - - if( keyCode == NX_KEYTYPE_FAST && !b_justJumped ) - { - if( keyState == 0 && keyRepeat == 0 ) - { - var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_NEXT ); - } - else if( keyRepeat == 1 ) - { - var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_JUMP_FORWARD_SHORT ); - b_justJumped = YES; - [self performSelector:@selector(resetJump) - withObject: NULL - afterDelay:0.25]; - } - } - - if( keyCode == NX_KEYTYPE_REWIND && !b_justJumped ) - { - if( keyState == 0 && keyRepeat == 0 ) - { - var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_PREV ); - } - else if( keyRepeat == 1 ) - { - var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_JUMP_BACKWARD_SHORT ); - b_justJumped = YES; - [self performSelector:@selector(resetJump) - withObject: NULL - afterDelay:0.25]; - } - } - } - } + if( [event type] == NSSystemDefined && [event subtype] == 8 ) + { + int keyCode = (([event data1] & 0xFFFF0000) >> 16); + int keyFlags = ([event data1] & 0x0000FFFF); + int keyState = (((keyFlags & 0xFF00) >> 8)) == 0xA; + int keyRepeat = (keyFlags & 0x1); + + if( keyCode == NX_KEYTYPE_PLAY && keyState == 0 ) + var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_PLAY_PAUSE ); + + if( keyCode == NX_KEYTYPE_FAST && !b_justJumped ) + { + if( keyState == 0 && keyRepeat == 0 ) + { + var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_NEXT ); + } + else if( keyRepeat == 1 ) + { + var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_JUMP_FORWARD_SHORT ); + b_justJumped = YES; + [self performSelector:@selector(resetJump) + withObject: NULL + afterDelay:0.25]; + } + } + + if( keyCode == NX_KEYTYPE_REWIND && !b_justJumped ) + { + if( keyState == 0 && keyRepeat == 0 ) + { + var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_PREV ); + } + else if( keyRepeat == 1 ) + { + var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_JUMP_BACKWARD_SHORT ); + b_justJumped = YES; + [self performSelector:@selector(resetJump) + withObject: NULL + afterDelay:0.25]; + } + } + } + } [super sendEvent: event]; } diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m index f1b654dd51..ecb5ea40db 100644 --- a/modules/gui/macosx/macosx.m +++ b/modules/gui/macosx/macosx.m @@ -95,6 +95,10 @@ void CloseVideoGL ( vlc_object_t * ); #define USE_MEDIAKEYS_LONGTEXT N_("By default, VLC can be controlled using the media keys on modern Apple " \ "keyboards.") +#define USE_MEDIAKEYS_BACKGROUND_TEXT N_("Use media key control when VLC is in background") +#define USE_MEDIAKEYS_BACKGROUND_LONGTEXT N_("By default, VLC will accept media key events also when being " \ + "in background.") + vlc_module_begin () set_description( N_("Mac OS X interface") ) set_capability( "interface", 200 ) @@ -113,6 +117,8 @@ vlc_module_begin () false ) add_bool( "macosx-mediakeys", 1, NULL, USE_MEDIAKEYS_TEXT, USE_MEDIAKEYS_LONGTEXT, false ) + add_bool( "macosx-mediakeys-background", 1, NULL, USE_MEDIAKEYS_BACKGROUND_TEXT, USE_MEDIAKEYS_BACKGROUND_LONGTEXT, + false ) add_submodule () set_description( "Mac OS X OpenGL" ) diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h index 458e46f5be..4078d92a85 100644 --- a/modules/gui/macosx/simple_prefs.h +++ b/modules/gui/macosx/simple_prefs.h @@ -91,6 +91,7 @@ IBOutlet id o_intf_fspanel_ckb; IBOutlet id o_intf_appleremote_ckb; IBOutlet id o_intf_mediakeys_ckb; + IBOutlet id o_intf_mediakeys_bg_ckb; IBOutlet id o_intf_lang_pop; IBOutlet id o_intf_lang_txt; IBOutlet id o_intf_network_box; diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index 310fd16131..e6a8c263a5 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -266,7 +266,8 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des [o_intf_network_box setTitle: _NS("Privacy / Network Interaction")]; [o_intf_appleremote_ckb setTitle: _NS("Control playback with the Apple Remote")]; [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")]; - + [o_intf_mediakeys_bg_ckb setTitle: _NS("...when VLC is in background")]; + /* Subtitles and OSD */ [o_osd_encoding_txt setStringValue: _NS("Default Encoding")]; [o_osd_font_box setTitle: _NS("Display Settings")]; @@ -304,6 +305,31 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des [o_sprefs_win setTitle: _NS("Preferences")]; } +/* TODO: move this part to core */ +#define config_GetLabel(a,b) __config_GetLabel(VLC_OBJECT(a),b) +static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_name ) +{ + module_config_t *p_config; + + p_config = config_FindConfig( p_this, psz_name ); + + /* sanity checks */ + if( !p_config ) + { + msg_Err( p_this, "option %s does not exist", psz_name ); + return NULL; + } + + if ( p_config->psz_longtext ) + return p_config->psz_longtext; + else if( p_config->psz_text ) + return p_config->psz_text; + else + msg_Warn( p_this, "option %s does not include any help" ); + + return NULL; +} + - (void)setupButton: (NSPopUpButton *)object forStringList: (const char *)name { module_config_t *p_item; @@ -393,10 +419,17 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des [object setToolTip: _NS(p_item->psz_longtext)]; } +- (void)setupButton: (NSButton *)object forBoolValue: (const char *)name +{ + [object setState: config_GetInt( p_intf, name )]; + [object setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, name )]]; +} + - (void)setupField:(NSTextField *)o_object forOption:(const char *)psz_option { char *psz_tmp = config_GetPsz( p_intf, psz_option ); [o_object setStringValue: [NSString stringWithUTF8String: psz_tmp ?: ""]]; + [o_object setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, psz_option )]]; free( psz_tmp ); } @@ -415,26 +448,30 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des [self setupButton: o_intf_lang_pop forStringList: "language"]; [self setupButton: o_intf_art_pop forIntList: "album-art"]; - [o_intf_fspanel_ckb setState: config_GetInt( p_intf, "macosx-fspanel" )]; - [o_intf_embedded_ckb setState: config_GetInt( p_intf, "embedded-video" )]; - [o_intf_appleremote_ckb setState: config_GetInt( p_intf, "macosx-appleremote" )]; - [o_intf_mediakeys_ckb setState: config_GetInt( p_intf, "macosx-mediakeys" )]; + [self setupButton: o_intf_fspanel_ckb forBoolValue: "macosx-fspanel"]; + [self setupButton: o_intf_embedded_ckb forBoolValue: "embedded-video"]; + [self setupButton: o_intf_appleremote_ckb forBoolValue: "macosx-appleremote"]; + [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"]; + [self setupButton: o_intf_mediakeys_bg_ckb forBoolValue: "macosx-mediakeys-background"]; + [o_intf_mediakeys_bg_ckb setEnabled: [o_intf_mediakeys_ckb state]]; /****************** * audio settings * ******************/ - [o_audio_enable_ckb setState: config_GetInt( p_intf, "audio" )]; + [self setupButton: o_audio_enable_ckb forBoolValue: "audio"]; i = (config_GetInt( p_intf, "volume" ) * 0.390625); + [o_audio_vol_fld setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, "volume")]]; [o_audio_vol_fld setIntValue: i]; + [o_audio_vol_sld setToolTip: [o_audio_vol_fld toolTip]]; [o_audio_vol_sld setIntValue: i]; - [o_audio_spdif_ckb setState: config_GetInt( p_intf, "spdif" )]; + [self setupButton: o_audio_spdif_ckb forBoolValue: "spdif"]; [self setupButton: o_audio_dolby_pop forIntList: "force-dolby-surround"]; [self setupField: o_audio_lang_fld forOption: "audio-language"]; - [o_audio_headphone_ckb setState: config_GetInt( p_intf, "headphone-dolby" )]; - + [self setupButton: o_audio_headphone_ckb forBoolValue: "headphone-dolby"]; + psz_tmp = config_GetPsz( p_intf, "audio-filter" ); if( psz_tmp ) { @@ -444,6 +481,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des free( psz_tmp ); } [o_audio_norm_fld setFloatValue: config_GetFloat( p_intf, "norm-max-level" )]; + [o_audio_norm_fld setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, "norm-max-level")]]; [self setupButton: o_audio_visual_pop forModuleList: "audio-visual"]; @@ -472,11 +510,11 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des /****************** * video settings * ******************/ - [o_video_enable_ckb setState: config_GetInt( p_intf, "video" )]; - [o_video_fullscreen_ckb setState: config_GetInt( p_intf, "fullscreen" )]; - [o_video_onTop_ckb setState: config_GetInt( p_intf, "video-on-top" )]; - [o_video_skipFrames_ckb setState: config_GetInt( p_intf, "skip-frames" )]; - [o_video_black_ckb setState: config_GetInt( p_intf, "macosx-black" )]; + [self setupButton: o_video_enable_ckb forBoolValue: "video"]; + [self setupButton: o_video_fullscreen_ckb forBoolValue: "fullscreen"]; + [self setupButton: o_video_onTop_ckb forBoolValue: "video-on-top"]; + [self setupButton: o_video_skipFrames_ckb forBoolValue: "skip-frames"]; + [self setupButton: o_video_black_ckb forBoolValue: "macosx-black"]; [self setupButton: o_video_output_pop forModuleList: "vout"]; @@ -497,22 +535,24 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des [o_video_device_pop selectItemAtIndex: 0]; [o_video_device_pop selectItemWithTag: config_GetInt( p_intf, "macosx-vdev" )]; - [self setupField:o_video_snap_folder_fld forOption:"snapshot-path"]; - [self setupField:o_video_snap_prefix_fld forOption:"snapshot-prefix"]; - [o_video_snap_seqnum_ckb setState: config_GetInt( p_intf, "snapshot-sequential" )]; + [self setupField: o_video_snap_folder_fld forOption:"snapshot-path"]; + [self setupField: o_video_snap_prefix_fld forOption:"snapshot-prefix"]; + [self setupButton: o_video_snap_seqnum_ckb forBoolValue: "snapshot-sequential"]; [self setupButton: o_video_snap_format_pop forStringList: "snapshot-format"]; /*************************** * input & codecs settings * ***************************/ - [o_input_serverport_fld setIntValue: config_GetInt( p_intf, "server-port" )]; - [self setupField:o_input_httpproxy_fld forOption:"http-proxy"]; - [self setupField:o_input_httpproxypwd_sfld forOption:"http-proxy-pwd"]; - [o_input_postproc_fld setIntValue: config_GetInt( p_intf, "postproc-q" )]; + [o_input_serverport_fld setIntValue: config_GetInt( p_intf, "server-port")]; + [o_input_serverport_fld setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, "server-port")]]; + [self setupField: o_input_httpproxy_fld forOption:"http-proxy"]; + [self setupField: o_input_httpproxypwd_sfld forOption:"http-proxy-pwd"]; + [o_input_postproc_fld setIntValue: config_GetInt( p_intf, "postproc-q")]; + [o_input_postproc_fld setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, "postproc-q")]]; [self setupButton: o_input_avi_pop forIntList: "avi-index"]; - [o_input_rtsp_ckb setState: config_GetInt( p_intf, "rtsp-tcp" )]; + [self setupButton: o_input_rtsp_ckb forBoolValue: "rtsp-tcp"]; [self setupButton: o_input_skipLoop_pop forIntList: "ffmpeg-skiploopfilter"]; [o_input_cachelevel_pop removeAllItems]; @@ -568,7 +608,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des /********************* * subtitle settings * *********************/ - [o_osd_osd_ckb setState: config_GetInt( p_intf, "osd" )]; + [self setupButton: o_osd_osd_ckb forBoolValue: "osd"]; [self setupButton: o_osd_encoding_pop forStringList: "subsdec-encoding"]; [self setupField: o_osd_lang_fld forOption: "sub-language" ]; @@ -742,6 +782,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch config_PutInt( p_intf, "embedded-video", [o_intf_embedded_ckb state] ); config_PutInt( p_intf, "macosx-appleremote", [o_intf_appleremote_ckb state] ); config_PutInt( p_intf, "macosx-mediakeys", [o_intf_mediakeys_ckb state] ); + config_PutInt( p_intf, "macosx-mediakeys-background", [o_intf_mediakeys_bg_ckb state] ); /* activate stuff without restart */ if( [o_intf_appleremote_ckb state] == YES ) @@ -948,7 +989,9 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch 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] ); + SaveStringList( o_osd_encoding_pop, "subsdec-encoding" ); + else + config_PutPsz( p_intf, "subsdec-encoding", "" ); config_PutPsz( p_intf, "sub-language", [[o_osd_lang_fld stringValue] UTF8String] ); @@ -1042,6 +1085,8 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch - (IBAction)interfaceSettingChanged:(id)sender { + if( sender == o_intf_mediakeys_ckb ) + [o_intf_mediakeys_bg_ckb setEnabled: [o_intf_mediakeys_ckb state]]; b_intfSettingChanged = YES; }