Changeset 6f54a5309b529a0368b21cf38854eb1e4e9f696a

Show
Ignore:
Timestamp:
10/09/06 22:12:12 (2 years ago)
Author:
Felix Paul Kühne <fkuehne@videolan.org>
git-committer:
Felix Paul Kühne <fkuehne@videolan.org> 1157919132 +0000
git-parent:

[277e9ab5a2a4df835797c6df5b7741f25b9721ad]

git-author:
Felix Paul Kühne <fkuehne@videolan.org> 1157919132 +0000
Message:

* New Fullscreen controller panel
- basically written by Jerome Decoodt <djc at videolan dot org> aka DiDjCodt?
plus
- various patches, coding-style fixes, etc. here and there
- integration to VLCControls
- automagic fading-in and -out when in fullscreen mode

TODO:
- get and use native graphics. These are currently being prepared by Simon Damkjaer Andersen, who already donated new playback mode icons (to be committed soon)
- implement the volume slider
- fix seeking with the time slider
- check for memory leaks
- further clean-up

ATTENTION:
for the moment, you need certain images from Jerome's patch to get this running. Put them to extras/MacOSX/Resources/ and it'll work. Otherwise, VLC won't crash, but only show strings.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib

    r0307453 r6f54a53  
    3434            LANGUAGE = ObjC;  
    3535            OUTLETS = { 
     36                "o_fs_panel" = id;  
    3637                "o_main" = id;  
    3738                "o_specificTime_cancel_btn" = id;  
    …… 
    99100            SUPERCLASS = NSObject;  
    100101        },  
     102        {CLASS = VLCFSPanel; LANGUAGE = ObjC; SUPERCLASS = NSWindow; },  
     103        { 
     104            ACTIONS = {faster = id; next = id; play = id; prev = id; slower = id; };  
     105            CLASS = VLCFSPanelView;  
     106            LANGUAGE = ObjC;  
     107            SUPERCLASS = NSView;  
     108        },  
     109        {CLASS = VLCFSTimeSlider; LANGUAGE = ObjC; SUPERCLASS = NSSlider; },  
    101110        { 
    102111            ACTIONS = { 

  • extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib

    r122fbea r6f54a53  
    44<dict> 
    55    <key>IBDocumentLocation</key> 
    6     <string>361 41 478 430 0 0 1440 878 </string> 
     6    <string>443 64 478 430 0 0 1440 878 </string> 
    77    <key>IBEditorPositions</key> 
    88    <dict> 
    …… 
    2626    <key>IBOpenObjects</key> 
    2727    <array> 
     28        <integer>21</integer> 
     29        <integer>2197</integer> 
    2830        <integer>2416</integer> 
     31        <integer>2730</integer> 
    2932        <integer>29</integer> 
    30         <integer>21</integer> 
    31         <integer>2730</integer> 
    32         <integer>2197</integer> 
     33        <integer>2769</integer> 
    3334    </array> 
    3435    <key>IBSystem Version</key> 

  • extras/MacOSX/vlc.pbproj/project.pbxproj

    r0a9dbda r6f54a53  
    1111        2A16E08006C5074F00C87B09 /* equalizerdrawer_active.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A16E07E06C5074F00C87B09 /* equalizerdrawer_active.png */; }; 
    1212        2A16E08106C5074F00C87B09 /* equalizerdrawer_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A16E07F06C5074F00C87B09 /* equalizerdrawer_blue.png */; }; 
     13        2AEF85F709A6623A00130822 /* FSBase.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85D309A6623A00130822 /* FSBase.tif */; }; 
     14        2AEF85F809A6623A00130822 /* FSExitOff.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85D409A6623A00130822 /* FSExitOff.tif */; }; 
     15        2AEF85F909A6623A00130822 /* FSExitOn.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85D509A6623A00130822 /* FSExitOn.tif */; }; 
     16        2AEF85FA09A6623A00130822 /* FSFastForwardOff.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85D609A6623A00130822 /* FSFastForwardOff.tif */; }; 
     17        2AEF85FB09A6623A00130822 /* FSFastForwardOn.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85D709A6623A00130822 /* FSFastForwardOn.tif */; }; 
     18        2AEF85FC09A6623A00130822 /* FSGotoBeginningOff.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85D809A6623A00130822 /* FSGotoBeginningOff.tif */; }; 
     19        2AEF85FD09A6623A00130822 /* FSGotoBeginningOn.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85D909A6623A00130822 /* FSGotoBeginningOn.tif */; }; 
     20        2AEF85FE09A6623A00130822 /* FSGotoEndOff.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85DA09A6623A00130822 /* FSGotoEndOff.tif */; }; 
     21        2AEF85FF09A6623A00130822 /* FSGotoEndOn.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85DB09A6623A00130822 /* FSGotoEndOn.tif */; }; 
     22        2AEF860009A6623A00130822 /* FSLCDChapterPopUp.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85DC09A6623A00130822 /* FSLCDChapterPopUp.tif */; }; 
     23        2AEF860109A6623A00130822 /* FSLCDSliderCenter.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85DD09A6623A00130822 /* FSLCDSliderCenter.tif */; }; 
     24        2AEF860209A6623A00130822 /* FSLCDSliderLeft.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85DE09A6623A00130822 /* FSLCDSliderLeft.tif */; }; 
     25        2AEF860309A6623A00130822 /* FSLCDSliderPlayHead.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85DF09A6623A00130822 /* FSLCDSliderPlayHead.tif */; }; 
     26        2AEF860409A6623A00130822 /* FSLCDSliderProgressiveDownloadCenter.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85E009A6623A00130822 /* FSLCDSliderProgressiveDownloadCenter.tif */; }; 
     27        2AEF860509A6623A00130822 /* FSLCDSliderProgressiveDownloadLeft.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85E109A6623A00130822 /* FSLCDSliderProgressiveDownloadLeft.tif */; }; 
     28        2AEF860609A6623A00130822 /* FSLCDSliderProgressiveDownloadRight.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85E209A6623A00130822 /* FSLCDSliderProgressiveDownloadRight.tif */; }; 
     29        2AEF860709A6623A00130822 /* FSLCDSliderRight.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85E309A6623A00130822 /* FSLCDSliderRight.tif */; }; 
     30        2AEF860809A6623A00130822 /* FSLCDTimeBackground.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85E409A6623A00130822 /* FSLCDTimeBackground.tif */; }; 
     31        2AEF860909A6623A00130822 /* FSPauseOff.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85E509A6623A00130822 /* FSPauseOff.tif */; }; 
     32        2AEF860A09A6623A00130822 /* FSPauseOn.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85E609A6623A00130822 /* FSPauseOn.tif */; }; 
     33        2AEF860B09A6623A00130822 /* FSPlayOff.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85E709A6623A00130822 /* FSPlayOff.tif */; }; 
     34        2AEF860C09A6623A00130822 /* FSPlayOn.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85E809A6623A00130822 /* FSPlayOn.tif */; }; 
     35        2AEF860D09A6623A00130822 /* FSRewindOff.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85E909A6623A00130822 /* FSRewindOff.tif */; }; 
     36        2AEF860E09A6623A00130822 /* FSRewindOn.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85EA09A6623A00130822 /* FSRewindOn.tif */; }; 
     37        2AEF860F09A6623A00130822 /* FSVolumeBackground.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85EB09A6623A00130822 /* FSVolumeBackground.tif */; }; 
     38        2AEF861009A6623A00130822 /* FSVolumeThumbOff.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85EC09A6623A00130822 /* FSVolumeThumbOff.tif */; }; 
     39        2AEF861109A6623A00130822 /* FSVolumeThumbOn.tif in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF85ED09A6623A00130822 /* FSVolumeThumbOn.tif */; }; 
     40        2AEF861F09A6665700130822 /* qt.png in Resources */ = {isa = PBXBuildFile; fileRef = 2AEF861E09A6665700130822 /* qt.png */; }; 
    1341        8E445F9D04728A700059A3A7 /* a52.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F8704728A700059A3A7 /* a52.icns */; }; 
    1442        8E445F9E04728A700059A3A7 /* aac.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F8804728A700059A3A7 /* aac.icns */; }; 
    …… 
    817845        2A16E07E06C5074F00C87B09 /* equalizerdrawer_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = equalizerdrawer_active.png; path = Resources/equalizerdrawer_active.png; sourceTree = "<group>"; }; 
    818846        2A16E07F06C5074F00C87B09 /* equalizerdrawer_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = equalizerdrawer_blue.png; path = Resources/equalizerdrawer_blue.png; sourceTree = "<group>"; }; 
     847        2AEF857609A5FEC900130822 /* fspanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fspanel.h; path = ../../modules/gui/macosx/fspanel.h; sourceTree = SOURCE_ROOT; }; 
     848        2AEF857709A5FEC900130822 /* fspanel.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = fspanel.m; path = ../../modules/gui/macosx/fspanel.m; sourceTree = SOURCE_ROOT; }; 
     849        2AEF85D309A6623A00130822 /* FSBase.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSBase.tif; path = Resources/FSBase.tif; sourceTree = "<group>"; }; 
     850        2AEF85D409A6623A00130822 /* FSExitOff.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSExitOff.tif; path = Resources/FSExitOff.tif; sourceTree = "<group>"; }; 
     851        2AEF85D509A6623A00130822 /* FSExitOn.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSExitOn.tif; path = Resources/FSExitOn.tif; sourceTree = "<group>"; }; 
     852        2AEF85D609A6623A00130822 /* FSFastForwardOff.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSFastForwardOff.tif; path = Resources/FSFastForwardOff.tif; sourceTree = "<group>"; }; 
     853        2AEF85D709A6623A00130822 /* FSFastForwardOn.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSFastForwardOn.tif; path = Resources/FSFastForwardOn.tif; sourceTree = "<group>"; }; 
     854        2AEF85D809A6623A00130822 /* FSGotoBeginningOff.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSGotoBeginningOff.tif; path = Resources/FSGotoBeginningOff.tif; sourceTree = "<group>"; }; 
     855        2AEF85D909A6623A00130822 /* FSGotoBeginningOn.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSGotoBeginningOn.tif; path = Resources/FSGotoBeginningOn.tif; sourceTree = "<group>"; }; 
     856        2AEF85DA09A6623A00130822 /* FSGotoEndOff.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSGotoEndOff.tif; path = Resources/FSGotoEndOff.tif; sourceTree = "<group>"; }; 
     857        2AEF85DB09A6623A00130822 /* FSGotoEndOn.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSGotoEndOn.tif; path = Resources/FSGotoEndOn.tif; sourceTree = "<group>"; }; 
     858        2AEF85DC09A6623A00130822 /* FSLCDChapterPopUp.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSLCDChapterPopUp.tif; path = Resources/FSLCDChapterPopUp.tif; sourceTree = "<group>"; }; 
     859        2AEF85DD09A6623A00130822 /* FSLCDSliderCenter.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSLCDSliderCenter.tif; path = Resources/FSLCDSliderCenter.tif; sourceTree = "<group>"; }; 
     860        2AEF85DE09A6623A00130822 /* FSLCDSliderLeft.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSLCDSliderLeft.tif; path = Resources/FSLCDSliderLeft.tif; sourceTree = "<group>"; }; 
     861        2AEF85DF09A6623A00130822 /* FSLCDSliderPlayHead.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSLCDSliderPlayHead.tif; path = Resources/FSLCDSliderPlayHead.tif; sourceTree = "<group>"; }; 
     862        2AEF85E009A6623A00130822 /* FSLCDSliderProgressiveDownloadCenter.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSLCDSliderProgressiveDownloadCenter.tif; path = Resources/FSLCDSliderProgressiveDownloadCenter.tif; sourceTree = "<group>"; }; 
     863        2AEF85E109A6623A00130822 /* FSLCDSliderProgressiveDownloadLeft.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSLCDSliderProgressiveDownloadLeft.tif; path = Resources/FSLCDSliderProgressiveDownloadLeft.tif; sourceTree = "<group>"; }; 
     864        2AEF85E209A6623A00130822 /* FSLCDSliderProgressiveDownloadRight.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSLCDSliderProgressiveDownloadRight.tif; path = Resources/FSLCDSliderProgressiveDownloadRight.tif; sourceTree = "<group>"; }; 
     865        2AEF85E309A6623A00130822 /* FSLCDSliderRight.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSLCDSliderRight.tif; path = Resources/FSLCDSliderRight.tif; sourceTree = "<group>"; }; 
     866        2AEF85E409A6623A00130822 /* FSLCDTimeBackground.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSLCDTimeBackground.tif; path = Resources/FSLCDTimeBackground.tif; sourceTree = "<group>"; }; 
     867        2AEF85E509A6623A00130822 /* FSPauseOff.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSPauseOff.tif; path = Resources/FSPauseOff.tif; sourceTree = "<group>"; }; 
     868        2AEF85E609A6623A00130822 /* FSPauseOn.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSPauseOn.tif; path = Resources/FSPauseOn.tif; sourceTree = "<group>"; }; 
     869        2AEF85E709A6623A00130822 /* FSPlayOff.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSPlayOff.tif; path = Resources/FSPlayOff.tif; sourceTree = "<group>"; }; 
     870        2AEF85E809A6623A00130822 /* FSPlayOn.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSPlayOn.tif; path = Resources/FSPlayOn.tif; sourceTree = "<group>"; }; 
     871        2AEF85E909A6623A00130822 /* FSRewindOff.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSRewindOff.tif; path = Resources/FSRewindOff.tif; sourceTree = "<group>"; }; 
     872        2AEF85EA09A6623A00130822 /* FSRewindOn.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSRewindOn.tif; path = Resources/FSRewindOn.tif; sourceTree = "<group>"; }; 
     873        2AEF85EB09A6623A00130822 /* FSVolumeBackground.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSVolumeBackground.tif; path = Resources/FSVolumeBackground.tif; sourceTree = "<group>"; }; 
     874        2AEF85EC09A6623A00130822 /* FSVolumeThumbOff.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSVolumeThumbOff.tif; path = Resources/FSVolumeThumbOff.tif; sourceTree = "<group>"; }; 
     875        2AEF85ED09A6623A00130822 /* FSVolumeThumbOn.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FSVolumeThumbOn.tif; path = Resources/FSVolumeThumbOn.tif; sourceTree = "<group>"; }; 
     876        2AEF861E09A6665700130822 /* qt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = qt.png; path = Resources/qt.png; sourceTree = "<group>"; }; 
    819877        8E445F8704728A700059A3A7 /* a52.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = a52.icns; path = Resources/a52.icns; sourceTree = SOURCE_ROOT; }; 
    820878        8E445F8804728A700059A3A7 /* aac.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = aac.icns; path = Resources/aac.icns; sourceTree = SOURCE_ROOT; }; 
    …… 
    915973        CC26BF3209A7A08C00E94D62 /* update.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = update.m; path = ../../modules/gui/macosx/update.m; sourceTree = SOURCE_ROOT; }; 
    916974        CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; }; 
     975        CC6D8D9C0A878DED006F2BBE /* AppleRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppleRemote.h; path = ../../modules/gui/macosx/AppleRemote.h; sourceTree = SOURCE_ROOT; }; 
     976        CC6D8D9D0A878DED006F2BBE /* AppleRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppleRemote.m; path = ../../modules/gui/macosx/AppleRemote.m; sourceTree = SOURCE_ROOT; }; 
    917977        CCF3C64B0923B99D00401862 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/SFilters.nib; sourceTree = "<group>"; }; 
    918978        CCF3C6500923B9D100401862 /* sfilters.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sfilters.h; path = ../../modules/gui/macosx/sfilters.h; sourceTree = SOURCE_ROOT; }; 
    …… 
    9781038            isa = PBXGroup; 
    9791039            children = ( 
     1040                2AEF85D009A661A500130822 /* FSPanel */, 
    9801041                DCF358BC077F1236007DB450 /* nibs */, 
    9811042                DCDA5E6408F94518009D93A8 /* about_bg.png */, 
    …… 
    10381099                CC26BF3109A7A08C00E94D62 /* update.h */, 
    10391100                CC26BF3209A7A08C00E94D62 /* update.m */, 
     1101                CC6D8D9C0A878DED006F2BBE /* AppleRemote.h */, 
     1102                CC6D8D9D0A878DED006F2BBE /* AppleRemote.m */, 
     1103                2AEF857609A5FEC900130822 /* fspanel.h */, 
     1104                2AEF857709A5FEC900130822 /* fspanel.m */, 
    10401105            ); 
    10411106            name = Classes; 
    …… 
    10661131            ); 
    10671132            name = Products; 
     1133            sourceTree = "<group>"; 
     1134        }; 
     1135        2AEF85D009A661A500130822 /* FSPanel */ = { 
     1136            isa = PBXGroup; 
     1137            children = ( 
     1138                2AEF861E09A6665700130822 /* qt.png */, 
     1139                2AEF85D309A6623A00130822 /* FSBase.tif */, 
     1140                2AEF85D409A6623A00130822 /* FSExitOff.tif */, 
     1141                2AEF85D509A6623A00130822 /* FSExitOn.tif */, 
     1142                2AEF85D609A6623A00130822 /* FSFastForwardOff.tif */, 
     1143                2AEF85D709A6623A00130822 /* FSFastForwardOn.tif */, 
     1144                2AEF85D809A6623A00130822 /* FSGotoBeginningOff.tif */, 
     1145                2AEF85D909A6623A00130822 /* FSGotoBeginningOn.tif */, 
     1146                2AEF85DA09A6623A00130822 /* FSGotoEndOff.tif */, 
     1147                2AEF85DB09A6623A00130822 /* FSGotoEndOn.tif */, 
     1148                2AEF85DC09A6623A00130822 /* FSLCDChapterPopUp.tif */, 
     1149                2AEF85DD09A6623A00130822 /* FSLCDSliderCenter.tif */, 
     1150                2AEF85DE09A6623A00130822 /* FSLCDSliderLeft.tif */, 
     1151                2AEF85DF09A6623A00130822 /* FSLCDSliderPlayHead.tif */, 
     1152                2AEF85E009A6623A00130822 /* FSLCDSliderProgressiveDownloadCenter.tif */, 
     1153                2AEF85E109A6623A00130822 /* FSLCDSliderProgressiveDownloadLeft.tif */, 
     1154                2AEF85E209A6623A00130822 /* FSLCDSliderProgressiveDownloadRight.tif */, 
     1155                2AEF85E309A6623A00130822 /* FSLCDSliderRight.tif */, 
     1156                2AEF85E409A6623A00130822 /* FSLCDTimeBackground.tif */, 
     1157                2AEF85E509A6623A00130822 /* FSPauseOff.tif */, 
     1158                2AEF85E609A6623A00130822 /* FSPauseOn.tif */, 
     1159                2AEF85E709A6623A00130822 /* FSPlayOff.tif */, 
     1160                2AEF85E809A6623A00130822 /* FSPlayOn.tif */, 
     1161                2AEF85E909A6623A00130822 /* FSRewindOff.tif */, 
     1162                2AEF85EA09A6623A00130822 /* FSRewindOn.tif */, 
     1163                2AEF85EB09A6623A00130822 /* FSVolumeBackground.tif */, 
     1164                2AEF85EC09A6623A00130822 /* FSVolumeThumbOff.tif */, 
     1165                2AEF85ED09A6623A00130822 /* FSVolumeThumbOn.tif */, 
     1166            ); 
     1167            name = FSPanel; 
    10681168            sourceTree = "<group>"; 
    10691169        }; 
    …… 
    12671367                C2F2A708095AE51700018C74 /* skip_forward_embedded_blue.png in Resources */, 
    12681368                C2F2A709095AE51700018C74 /* skip_previous_embedded_blue.png in Resources */, 
     1369                2AEF85F709A6623A00130822 /* FSBase.tif in Resources */, 
     1370                2AEF85F809A6623A00130822 /* FSExitOff.tif in Resources */, 
     1371                2AEF85F909A6623A00130822 /* FSExitOn.tif in Resources */, 
     1372                2AEF85FA09A6623A00130822 /* FSFastForwardOff.tif in Resources */, 
     1373                2AEF85FB09A6623A00130822 /* FSFastForwardOn.tif in Resources */, 
     1374                2AEF85FC09A6623A00130822 /* FSGotoBeginningOff.tif in Resources */, 
     1375                2AEF85FD09A6623A00130822 /* FSGotoBeginningOn.tif in Resources */, 
     1376                2AEF85FE09A6623A00130822 /* FSGotoEndOff.tif in Resources */, 
     1377                2AEF85FF09A6623A00130822 /* FSGotoEndOn.tif in Resources */, 
     1378                2AEF860009A6623A00130822 /* FSLCDChapterPopUp.tif in Resources */, 
     1379                2AEF860109A6623A00130822 /* FSLCDSliderCenter.tif in Resources */, 
     1380                2AEF860209A6623A00130822 /* FSLCDSliderLeft.tif in Resources */, 
     1381                2AEF860309A6623A00130822 /* FSLCDSliderPlayHead.tif in Resources */, 
     1382                2AEF860409A6623A00130822 /* FSLCDSliderProgressiveDownloadCenter.tif in Resources */, 
     1383                2AEF860509A6623A00130822 /* FSLCDSliderProgressiveDownloadLeft.tif in Resources */, 
     1384                2AEF860609A6623A00130822 /* FSLCDSliderProgressiveDownloadRight.tif in Resources */, 
     1385                2AEF860709A6623A00130822 /* FSLCDSliderRight.tif in Resources */, 
     1386                2AEF860809A6623A00130822 /* FSLCDTimeBackground.tif in Resources */, 
     1387                2AEF860909A6623A00130822 /* FSPauseOff.tif in Resources */, 
     1388                2AEF860A09A6623A00130822 /* FSPauseOn.tif in Resources */, 
     1389                2AEF860B09A6623A00130822 /* FSPlayOff.tif in Resources */, 
     1390                2AEF860C09A6623A00130822 /* FSPlayOn.tif in Resources */, 
     1391                2AEF860D09A6623A00130822 /* FSRewindOff.tif in Resources */, 
     1392                2AEF860E09A6623A00130822 /* FSRewindOn.tif in Resources */, 
     1393                2AEF860F09A6623A00130822 /* FSVolumeBackground.tif in Resources */, 
     1394                2AEF861009A6623A00130822 /* FSVolumeThumbOff.tif in Resources */, 
     1395                2AEF861109A6623A00130822 /* FSVolumeThumbOn.tif in Resources */, 
     1396                2AEF861F09A6665700130822 /* qt.png in Resources */, 
    12691397                CC26BF2C09A7A05000E94D62 /* Update.nib in Resources */, 
    12701398                CC1B4B4D09A8CF9E0078AD2E /* Interaction.nib in Resources */, 

  • modules/gui/macosx/Modules.am

    r55f33b6 r6f54a53  
    4343    embeddedwindow.h \ 
    4444    embeddedwindow.m \ 
     45    fspanel.m \ 
     46    fspanel.h \ 
    4547    update.h \ 
    4648    update.m \ 

  • modules/gui/macosx/controls.h

    r8ac58f0 r6f54a53  
    2424 *****************************************************************************/ 
    2525 
     26#import "fspanel.h" 
     27 
    2628/***************************************************************************** 
    2729 * VLCControls interface  
    …… 
    4244    IBOutlet id o_specificTime_stepper; 
    4345    IBOutlet id o_specificTime_mi; 
     46     
     47    VLCFSPanel *o_fs_panel; 
    4448} 
    4549 
    …… 
    8084- (IBAction)goToSpecificTime:(id)sender; 
    8185 
     86- (id)getFSPanel; 
     87 
    8288@end 
    8389 

  • modules/gui/macosx/controls.m

    r9204240 r6f54a53  
    3333 
    3434#include "intf.h" 
     35#include "fspanel.h" 
    3536#include "vout.h" 
    3637#include "open.h" 
    …… 
    4344 *****************************************************************************/ 
    4445@implementation VLCControls 
     46 
     47- (id)init 
     48{ 
     49    [super init]; 
     50    o_fs_panel = [[VLCFSPanel alloc] init]; 
     51    return self; 
     52} 
    4553 
    4654- (void)awakeFromNib 
    …… 
    671679} 
    672680 
     681- (id)getFSPanel 
     682{ 
     683    if( o_fs_panel ) 
     684        return o_fs_panel; 
     685    else 
     686    { 
     687        msg_Err( VLCIntf, "FSPanel is nil" ); 
     688        return NULL; 
     689    } 
     690} 
     691 
    673692@end 
    674693 

  • modules/gui/macosx/embeddedwindow.m

    r2cb472d r6f54a53  
    2727 
    2828#include "intf.h" 
     29#include "fspanel.h" 
    2930#include "vout.h" 
    3031#include "embeddedwindow.h" 

  • modules/gui/macosx/intf.h

    rd57320b r6f54a53  
    147147 
    148148    IBOutlet id o_info_window;  /* Info panel     */ 
     149    IBOutlet id o_fs_panel;     /* Full screen panel*/ 
    149150 
    150151    /* main menu */ 

  • modules/gui/macosx/intf.m

    rb085697 r6f54a53  
    3333#include <vlc_keys.h> 
    3434 
    35 #include "intf.h" 
    36 #include "vout.h" 
    37 #include "prefs.h" 
    38 #include "playlist.h" 
    39 #include "controls.h" 
    40 #include "about.h" 
    41 #include "open.h" 
    42 #include "wizard.h" 
    43 #include "extended.h" 
    44 #include "bookmarks.h" 
    45 #include "sfilters.h" 
    46 #include "interaction.h" 
    47 #include "embeddedwindow.h" 
    48 #include "update.h" 
    49 #include "AppleRemote.h" 
     35#import "intf.h" 
     36#import "fspanel.h" 
     37#import "vout.h" 
     38#import "prefs.h" 
     39#import "playlist.h" 
     40#import "controls.h" 
     41#import "about.h" 
     42#import "open.h" 
     43#import "wizard.h" 
     44#import "extended.h" 
     45#import "bookmarks.h" 
     46#import "sfilters.h" 
     47#import "interaction.h" 
     48#import "embeddedwindow.h" 
     49#import "update.h" 
     50#import "AppleRemote.h" 
    5051 
    5152/***************************************************************************** 
    …… 
    480481    p_intf->b_interaction = VLC_TRUE; 
    481482 
     483    // First we setup the blue selection box - another window that will be attached as a child window 
     484    // to this one, and will be moved by timers as needed. 
     485 
    482486    nib_main_loaded = TRUE; 
    483487} 
    …… 
    10651069        [o_timeslider setEnabled: b_seekable]; 
    10661070        [o_timefield setStringValue: @"0:00:00"]; 
     1071        [[[self getControls] getFSPanel] setStreamPos: 0 setSeconds: 0]; 
    10671072 
    10681073        [o_embedded_window setSeekable: b_seekable]; 
    …… 
    11211126                    p_playlist->status.p_item->p_input->psz_name]; 
    11221127            [self setScrollField: o_temp stopAfter:-1]; 
     1128            [[[self getControls] getFSPanel] setStreamTitle: o_temp]; 
    11231129 
    11241130            p_vout = vlc_object_find( p_intf->p_sys->p_input, VLC_OBJECT_VOUT, 
    …… 
    11671173                            (int) (i_seconds % 60)]; 
    11681174            [o_timefield setStringValue: o_time]; 
     1175            [[[self getControls] getFSPanel] setStreamPos: pos.f_float setSeconds: i_seconds]; 
    11691176            [o_embedded_window setTime: o_time position: f_updated]; 
    11701177        } 
    …… 
    13901397    if( i_status == PLAYING_S ) 
    13911398    { 
     1399        [[[self getControls] getFSPanel] setPause]; 
    13921400        [o_btn_play setImage: o_img_pause]; 
    13931401        [o_btn_play setAlternateImage: o_img_pause_pressed]; 
    …… 
    13991407    else 
    14001408    { 
     1409        [[[self getControls] getFSPanel] setPlay]; 
    14011410        [o_btn_play setImage: o_img_play]; 
    14021411        [o_btn_play setAlternateImage: o_img_play_pressed]; 
    …… 
    14741483                        (int) (i_seconds % 60)]; 
    14751484        [o_timefield setStringValue: o_time]; 
     1485        [[[self getControls] getFSPanel] setStreamPos: pos.f_float setSeconds: i_seconds]; 
    14761486        [o_embedded_window setTime: o_time position: f_updated]; 
    14771487    } 

  • modules/gui/macosx/vout.m

    r6c30ac6 r6f54a53  
    4141 
    4242#include "intf.h" 
     43#include "fspanel.h" 
    4344#include "vout.h" 
     45#import "controls.h" 
    4446 
    4547/***************************************************************************** 
    …… 
    378380    val.b_bool = !val.b_bool; 
    379381    var_Set( p_real_vout, "fullscreen", val ); 
     382    if( [self isFullscreen] ) 
     383        [[[[VLCMain sharedInstance] getControls] getFSPanel] orderFront: self]; 
     384    else 
     385        [[[[VLCMain sharedInstance] getControls] getFSPanel] orderOut: self]; 
    380386} 
    381387 
    …… 
    610616            var_Set( p_vout, "mouse-moved", val ); 
    611617        } 
     618        if( [self isFullscreen] ) 
     619            [[[[VLCMain sharedInstance] getControls] getFSPanel] fadeIn]; 
    612620    } 
    613621 
    …… 
    944952              backing: NSBackingStoreBuffered 
    945953              defer: YES screen: o_screen]; 
    946  
     954         
    947955        if( var_GetBool( p_real_vout, "macosx-black" ) ) 
    948956        if( b_black == VLC_TRUE )