Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
f940d5e2
Commit
f940d5e2
authored
Jul 31, 2011
by
Felix Paul Kühne
Browse files
macosx: fixed playlist/video toggling and some memory leaks
parent
ae7db4e9
Changes
7
Hide whitespace changes
Inline
Side-by-side
extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
View file @
f940d5e2
...
...
@@ -24,7 +24,7 @@
<integer value="2730"/>
<integer value="1617"/>
<integer value="4596"/>
<integer value="
1590
"/>
<integer value="
24
"/>
<integer value="915"/>
<integer value="283"/>
<integer value="2"/>
...
...
@@ -417,11 +417,11 @@
<reference key="NSControlView" ref="1051664676"/>
<int key="NSButtonFlags">138690815</int>
<int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage"
id="266631239"
>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">repeat</string>
</object>
<object class="NSCustomResource" key="NSAlternateImage"
id="567639636"
>
<object class="NSCustomResource" key="NSAlternateImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">repeat-pressed</string>
</object>
...
...
@@ -445,8 +445,14 @@
<reference key="NSControlView" ref="955174811"/>
<int key="NSButtonFlags">138690815</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="266631239"/>
<reference key="NSAlternateImage" ref="567639636"/>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">playlist</string>
</object>
<object class="NSCustomResource" key="NSAlternateImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">playlist-pressed</string>
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
...
...
@@ -924,7 +930,7 @@
<reference key="NSSuperview" ref="576307303"/>
<reference key="NSTableView" ref="23448837"/>
</object>
<object class="_NSCornerView" key="NSCornerView" id="
1071236617
">
<object class="_NSCornerView" key="NSCornerView" id="
638975146
">
<reference key="NSNextResponder" ref="915491793"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
...
...
@@ -1101,7 +1107,7 @@
<reference key="NSBGColor" ref="885475112"/>
<int key="NScvFlags">4</int>
</object>
<reference ref="
1071236617
"/>
<reference ref="
638975146
"/>
</object>
<string key="NSFrame">{{-1, 0}, {482, 254}}</string>
<reference key="NSSuperview" ref="440594360"/>
...
...
@@ -1111,7 +1117,7 @@
<reference key="NSHScroller" ref="297523533"/>
<reference key="NSContentView" ref="343242432"/>
<reference key="NSHeaderClipView" ref="576307303"/>
<reference key="NSCornerView" ref="
1071236617
"/>
<reference key="NSCornerView" ref="
638975146
"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBiAAAQYgAAA</bytes>
</object>
<object class="NSImageView" id="447614808">
...
...
@@ -1160,7 +1166,7 @@
</object>
<object class="NSCustomView" id="515305233">
<reference key="NSNextResponder" ref="429932428"/>
<int key="NSvFlags">
2
74</int>
<int key="NSvFlags">
-21474833
74</int>
<string key="NSFrame">{{401, 110}, {163, 96}}</string>
<reference key="NSSuperview" ref="429932428"/>
<string key="NSClassName">NSView</string>
...
...
@@ -2320,7 +2326,7 @@
</object>
<object class="NSMenuItem" id="355945594">
<reference key="NSMenu" ref="1016637396"/>
<string key="NSTitle">
Controller
</string>
<string key="NSTitle">
Playback Window
</string>
<string key="NSKeyEquiv">C</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
...
...
@@ -4734,14 +4740,6 @@ LCAuLi4</string>
</object>
<int key="connectionID">2296</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">togglePlaylist:</string>
<reference key="source" ref="199714555"/>
<reference key="destination" ref="302191520"/>
</object>
<int key="connectionID">2297</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">savePlaylist:</string>
...
...
@@ -6470,14 +6468,6 @@ LCAuLi4</string>
</object>
<int key="connectionID">4592</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">showController:</string>
<reference key="source" ref="199714555"/>
<reference key="destination" ref="355945594"/>
</object>
<int key="connectionID">4594</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_fs_panel</string>
...
...
@@ -6894,6 +6884,22 @@ LCAuLi4</string>
</object>
<int key="connectionID">4702</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">togglePlaylist:</string>
<reference key="source" ref="498338108"/>
<reference key="destination" ref="302191520"/>
</object>
<int key="connectionID">4703</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">makeKeyAndOrderFront:</string>
<reference key="source" ref="498338108"/>
<reference key="destination" ref="355945594"/>
</object>
<int key="connectionID">4704</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
...
...
@@ -11054,7 +11060,7 @@ LCAuLi4</string>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">470
2
</int>
<int key="maxID">470
4
</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
...
...
@@ -11062,7 +11068,7 @@ LCAuLi4</string>
<object class="IBPartialClassDescription">
<string key="className">ITSlider</string>
<string key="superclassName">NSSlider</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
895235229
">
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
516086310
">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../../../modules/gui/macosx/misc.h</string>
</object>
...
...
@@ -11113,17 +11119,17 @@ LCAuLi4</string>
<object class="IBPartialClassDescription">
<string key="className">TimeLineSlider</string>
<string key="superclassName">NSSlider</string>
<reference key="sourceIdentifier" ref="
895235229
"/>
<reference key="sourceIdentifier" ref="
516086310
"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLBrushedMetalImageView</string>
<string key="superclassName">NSImageView</string>
<reference key="sourceIdentifier" ref="
895235229
"/>
<reference key="sourceIdentifier" ref="
516086310
"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCApplication</string>
<string key="superclassName">NSApplication</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
124529938
">
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
906960470
">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../../../modules/gui/macosx/intf.h</string>
</object>
...
...
@@ -11343,7 +11349,7 @@ LCAuLi4</string>
<object class="IBPartialClassDescription">
<string key="className">VLCControllerView</string>
<string key="superclassName">NSView</string>
<reference key="sourceIdentifier" ref="
895235229
"/>
<reference key="sourceIdentifier" ref="
516086310
"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCControls</string>
...
...
@@ -11633,7 +11639,6 @@ LCAuLi4</string>
<string>saveDebugLog:</string>
<string>showController:</string>
<string>showMessagesPanel:</string>
<string>togglePlaylist:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
...
...
@@ -11642,7 +11647,6 @@ LCAuLi4</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
...
...
@@ -11654,7 +11658,6 @@ LCAuLi4</string>
<string>saveDebugLog:</string>
<string>showController:</string>
<string>showMessagesPanel:</string>
<string>togglePlaylist:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
...
...
@@ -11678,10 +11681,6 @@ LCAuLi4</string>
<string key="name">showMessagesPanel:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">togglePlaylist:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
...
...
@@ -11702,6 +11701,7 @@ LCAuLi4</string>
<string>o_crashrep_win</string>
<string>o_embedded_list</string>
<string>o_eyetv</string>
<string>o_info</string>
<string>o_mainmenu</string>
<string>o_mainwindow</string>
<string>o_messages</string>
...
...
@@ -11732,6 +11732,7 @@ LCAuLi4</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>NSTextView</string>
<string>NSButton</string>
<string>NSWindow</string>
...
...
@@ -11761,6 +11762,7 @@ LCAuLi4</string>
<string>o_crashrep_win</string>
<string>o_embedded_list</string>
<string>o_eyetv</string>
<string>o_info</string>
<string>o_mainmenu</string>
<string>o_mainwindow</string>
<string>o_messages</string>
...
...
@@ -11831,6 +11833,10 @@ LCAuLi4</string>
<string key="name">o_eyetv</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_info</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mainmenu</string>
<string key="candidateClassName">id</string>
...
...
@@ -11877,7 +11883,7 @@ LCAuLi4</string>
</object>
</object>
</object>
<reference key="sourceIdentifier" ref="
124529938
"/>
<reference key="sourceIdentifier" ref="
906960470
"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCMainMenu</string>
...
...
@@ -13355,7 +13361,7 @@ LCAuLi4</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="9
2274834
">
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="9
0305680
">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../../../modules/gui/macosx/MainWindow.h</string>
</object>
...
...
@@ -13672,7 +13678,7 @@ LCAuLi4</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
276879957
">
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
877349596
">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../../../modules/gui/macosx/playlist.h</string>
</object>
...
...
@@ -13754,22 +13760,22 @@ LCAuLi4</string>
</object>
</object>
</object>
<reference key="sourceIdentifier" ref="
276879957
"/>
<reference key="sourceIdentifier" ref="
877349596
"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCPlaylistView</string>
<string key="superclassName">NSOutlineView</string>
<reference key="sourceIdentifier" ref="
276879957
"/>
<reference key="sourceIdentifier" ref="
877349596
"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCProgressBarGradientEffect</string>
<string key="superclassName">NSView</string>
<reference key="sourceIdentifier" ref="9
2274834
"/>
<reference key="sourceIdentifier" ref="9
0305680
"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCTimeField</string>
<string key="superclassName">NSTextField</string>
<reference key="sourceIdentifier" ref="
895235229
"/>
<reference key="sourceIdentifier" ref="
516086310
"/>
</object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
...
...
@@ -13822,21 +13828,21 @@ LCAuLi4</string>
<object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
<string key="superclassName">NSResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
746528700
">
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
677106478
">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
458705762
">
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
78082470
">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
870911964
">
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
54696632
">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
</object>
...
...
@@ -13905,7 +13911,7 @@ LCAuLi4</string>
<object class="IBPartialClassDescription">
<string key="className">NSControl</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
988663145
">
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
1027851250
">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
</object>
...
...
@@ -13945,7 +13951,7 @@ LCAuLi4</string>
<object class="IBPartialClassDescription">
<string key="className">NSMenu</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="9
62500951
">
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="9
98866996
">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
</object>
...
...
@@ -13953,7 +13959,7 @@ LCAuLi4</string>
<object class="IBPartialClassDescription">
<string key="className">NSMenuItem</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
656171444
">
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
827263072
">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
</object>
...
...
@@ -13983,19 +13989,19 @@ LCAuLi4</string>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<reference key="sourceIdentifier" ref="
746528700
"/>
<reference key="sourceIdentifier" ref="
677106478
"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<reference key="sourceIdentifier" ref="
458705762
"/>
<reference key="sourceIdentifier" ref="
78082470
"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<reference key="sourceIdentifier" ref="
870911964
"/>
<reference key="sourceIdentifier" ref="
54696632
"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<reference key="sourceIdentifier" ref="
988663145
"/>
<reference key="sourceIdentifier" ref="
1027851250
"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
...
...
@@ -14034,7 +14040,7 @@ LCAuLi4</string>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<reference key="sourceIdentifier" ref="9
62500951
"/>
<reference key="sourceIdentifier" ref="9
98866996
"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
...
...
@@ -14045,7 +14051,7 @@ LCAuLi4</string>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
102901
665">
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
5654
665
18
">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
</object>
...
...
@@ -14066,7 +14072,7 @@ LCAuLi4</string>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
51551960
">
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
736239412
">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
</object>
...
...
@@ -14080,7 +14086,7 @@ LCAuLi4</string>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
592770993
">
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
702574657
">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSView.h</string>
</object>
...
...
@@ -14269,7 +14275,7 @@ LCAuLi4</string>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
443612334
">
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="
1033545388
">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">QTKit.framework/Headers/QTMovieView.h</string>
</object>
...
...
@@ -14347,7 +14353,7 @@ LCAuLi4</string>
<object class="IBPartialClassDescription">
<string key="className">NSOutlineView</string>
<string key="superclassName">NSTableView</string>
<reference key="sourceIdentifier" ref="
102901
665"/>
<reference key="sourceIdentifier" ref="
5654
665
18
"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSPanel</string>
...
...
@@ -14487,7 +14493,7 @@ LCAuLi4</string>
<object class="IBPartialClassDescription">
<string key="className">NSTableView</string>
<string key="superclassName">NSControl</string>
<reference key="sourceIdentifier" ref="
51551960
"/>
<reference key="sourceIdentifier" ref="
736239412
"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSText</string>
...
...
@@ -14530,7 +14536,7 @@ LCAuLi4</string>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSView</string>
<reference key="sourceIdentifier" ref="
656171444
"/>
<reference key="sourceIdentifier" ref="
827263072
"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSView</string>
...
...
@@ -14542,7 +14548,7 @@ LCAuLi4</string>
<object class="IBPartialClassDescription">
<string key="className">NSView</string>
<string key="superclassName">NSResponder</string>
<reference key="sourceIdentifier" ref="
592770993
"/>
<reference key="sourceIdentifier" ref="
702574657
"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSWindow</string>
...
...
@@ -14720,7 +14726,7 @@ LCAuLi4</string>
</object>
</object>
</object>
<reference key="sourceIdentifier" ref="
443612334
"/>
<reference key="sourceIdentifier" ref="
1033545388
"/>
</object>
</object>
</object>
...
...
@@ -14770,6 +14776,8 @@ LCAuLi4</string>
<string>fullscreen-double-buttons-pressed</string>
<string>play</string>
<string>play-pressed</string>
<string>playlist</string>
<string>playlist-pressed</string>
<string>progression-track-wrapper-left</string>
<string>progression-track-wrapper-middle</string>
<string>progression-track-wrapper-right</string>
...
...
@@ -14811,6 +14819,8 @@ LCAuLi4</string>
<string>{29, 23}</string>
<string>{29, 30}</string>
<string>{29, 30}</string>
<string>{512, 512}</string>
<string>{28, 23}</string>
<string>{3, 14}</string>
<string>{3, 14}</string>
<string>{3, 14}</string>
...
...
extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
View file @
f940d5e2
No preview for this file type
modules/gui/macosx/MainMenu.m
View file @
f940d5e2
...
...
@@ -327,7 +327,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
[
o_mi_minimize
setTitle
:
_NS
(
"Minimize Window"
)];
[
o_mi_close_window
setTitle
:
_NS
(
"Close Window"
)];
[
o_mi_player
setTitle
:
_NS
(
"Player..."
)];
[
o_mi_controller
setTitle
:
_NS
(
"
Controller
..."
)];
[
o_mi_controller
setTitle
:
_NS
(
"
Main Window
..."
)];
[
o_mi_audioeffects
setTitle
:
_NS
(
"Audio Effects..."
)];
[
o_mi_videoeffects
setTitle
:
_NS
(
"Video Filters..."
)];
[
o_mi_bookmarks
setTitle
:
_NS
(
"Bookmarks..."
)];
...
...
modules/gui/macosx/MainWindow.h
View file @
f940d5e2
...
...
@@ -98,7 +98,7 @@
-
(
IBAction
)
fullscreen
:(
id
)
sender
;
-
(
id
)
videoView
;
-
(
void
)
setVideoplayEnabled
:(
BOOL
)
b_value
;
-
(
void
)
setVideoplayEnabled
;
-
(
void
)
updateTimeSlider
;
-
(
void
)
updateVolumeSlider
;
-
(
void
)
updateWindow
;
...
...
modules/gui/macosx/MainWindow.m
View file @
f940d5e2
...
...
@@ -304,8 +304,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
-
(
IBAction
)
togglePlaylist
:(
id
)
sender
{
NSLog
(
@"b_videoplayen %i"
,
b_video_playback_enabled
);
if
(
b_video_playback_enabled
&&
[
o_video_view
isHidden
])
{
if
([
o_video_view
isHidden
]
&&
[
o_playlist_btn
isEnabled
])
{
[
o_video_view
setHidden
:
NO
];
[
o_playlist_table
setHidden
:
YES
];
}
...
...
@@ -669,18 +668,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
return
o_video_view
;
}
-
(
void
)
setVideoplayEnabled
:(
BOOL
)
b_value
-
(
void
)
setVideoplayEnabled
{
NSLog
(
@"setVideoplayEnabled:%i"
,
b_value
);
if
(
b_value
)
{
b_video_playback_enabled
=
YES
;
[
o_playlist_btn
setEnabled
:
YES
];
}
else
{
b_video_playback_enabled
=
NO
;
[
o_playlist_btn
setEnabled
:
NO
];
}
[
o_playlist_btn
setEnabled
:
[[
VLCMain
sharedInstance
]
activeVideoPlayback
]];
}
@end
...
...
modules/gui/macosx/intf.h
View file @
f940d5e2
...
...
@@ -93,7 +93,7 @@ struct intf_sys_t
id
o_wizard
;
/* VLCWizard */
id
o_embedded_list
;
/* VLCEmbeddedList*/
id
o_coredialogs
;
/* VLCCoreDialogProvider */
VLCInformation
*
o_info
;
/* VLCInformation */
id
o_info
;
/* VLCInformation */
id
o_eyetv
;
/* VLCEyeTVController */
id
o_bookmarks
;
/* VLCBookmarks */
id
o_coreinteraction
;
/* VLCCoreInteraction */
...
...
@@ -105,6 +105,7 @@ struct intf_sys_t
BOOL
nib_info_loaded
;
/* information panel nibfile */
BOOL
nib_coredialogs_loaded
;
/* CoreDialogs nibfile */
BOOL
nib_bookmarks_loaded
;
/* Bookmarks nibfile */
BOOL
b_active_videoplayback
;
IBOutlet
id
o_mainwindow
;
/* VLCMainWindow */
...
...
@@ -163,6 +164,8 @@ struct intf_sys_t
-
(
id
)
coreDialogProvider
;
-
(
id
)
eyeTVController
;
-
(
id
)
appleRemoteController
;
-
(
void
)
setActiveVideoPlayback
:(
BOOL
)
b_value
;
-
(
BOOL
)
activeVideoPlayback
;
-
(
void
)
applicationWillTerminate
:(
NSNotification
*
)
notification
;
-
(
NSString
*
)
localizedString
:(
const
char
*
)
psz
;
-
(
char
*
)
delocalizeString
:(
NSString
*
)
psz
;
...
...
@@ -186,8 +189,6 @@ struct intf_sys_t
-
(
void
)
updateMessageDisplay
;
-
(
IBAction
)
showController
:(
id
)
sender
;
-
(
IBAction
)
crashReporterAction
:(
id
)
sender
;
-
(
IBAction
)
openCrashLog
:(
id
)
sender
;
-
(
IBAction
)
saveDebugLog
:(
id
)
sender
;
...
...
@@ -195,7 +196,6 @@ struct intf_sys_t
-
(
void
)
processReceivedlibvlcMessage
:(
const
msg_item_t
*
)
item
;
-
(
IBAction
)
togglePlaylist
:(
id
)
sender
;
-
(
void
)
updateTogglePlaylistState
;
-
(
void
)
windowDidBecomeKey
:(
NSNotification
*
)
o_notification
;
...
...
modules/gui/macosx/intf.m
View file @
f940d5e2
...
...
@@ -145,8 +145,7 @@ int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg )
return
VLC_EGENERIC
;
}
[[
VLCMainWindow
sharedInstance
]
setVideoplayEnabled
:
YES
];
[[
VLCMainWindow
sharedInstance
]
togglePlaylist
:
nil
];
[[
VLCMain
sharedInstance
]
setActiveVideoPlayback
:
YES
];
p_wnd
->
control
=
WindowControl
;
p_wnd
->
sys
=
(
vout_window_sys_t
*
)
VLCIntf
;
[
o_pool
release
];
...
...
@@ -170,7 +169,7 @@ static int WindowControl( vout_window_t *p_wnd, int i_query, va_list args )
void
WindowClose
(
vout_window_t
*
p_wnd
)
{
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
[[
VLCMain
Window
sharedInstance
]
setVideo
p
lay
Enabled
:
NO
];
[[
VLCMain
sharedInstance
]
set
Active
Video
P
lay
back
:
NO
];
NSLog
(
@"Window Close"
);
// tell the interface to get rid of the video, TODO
[
o_pool
release
];
...
...
@@ -234,6 +233,7 @@ static void MsgCallback( msg_cb_data_t *data, const msg_item_t *item )
static
int
InputEvent
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
vlc_value_t
oldval
,
vlc_value_t
new_val
,
void
*
param
)
{
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
switch
(
new_val
.
i_int
)
{
case
INPUT_EVENT_STATE
:
[[
VLCMain
sharedInstance
]
playbackStatusUpdated
];
...
...
@@ -301,38 +301,47 @@ static int InputEvent( vlc_object_t *p_this, const char *psz_var,
break
;
}
[
o_pool
release
];
return
VLC_SUCCESS
;
}
static
int
PLItemChanged
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
vlc_value_t
oldval
,
vlc_value_t
new_val
,
void
*
param
)
{
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
[[
VLCMain
sharedInstance
]
performSelectorOnMainThread
:
@selector
(
PlaylistItemChanged
)
withObject
:
nil
waitUntilDone
:
NO
];
[
o_pool
release
];
return
VLC_SUCCESS
;
}
static
int
PlaylistUpdated
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
vlc_value_t
oldval
,
vlc_value_t
new_val
,
void
*
param
)
{
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
[[
VLCMain
sharedInstance
]
performSelectorOnMainThread
:
@selector
(
playlistUpdated
)
withObject
:
nil
waitUntilDone
:
NO
];