Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
4ad2f8dc
Commit
4ad2f8dc
authored
Jul 13, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: Make sure the o_info object gets released even if the nib has not been loaded.
parent
a3694386
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
modules/gui/macosx/intf.h
modules/gui/macosx/intf.h
+2
-1
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+2
-2
modules/gui/macosx/playlistinfo.h
modules/gui/macosx/playlistinfo.h
+2
-0
modules/gui/macosx/playlistinfo.m
modules/gui/macosx/playlistinfo.m
+1
-1
No files found.
modules/gui/macosx/intf.h
View file @
4ad2f8dc
...
@@ -93,6 +93,7 @@ struct intf_sys_t
...
@@ -93,6 +93,7 @@ struct intf_sys_t
* VLCMain interface
* VLCMain interface
*****************************************************************************/
*****************************************************************************/
@class
AppleRemote
;
@class
AppleRemote
;
@class
VLCInformation
;
@interface
VLCMain
:
NSObject
@interface
VLCMain
:
NSObject
{
{
intf_thread_t
*
p_intf
;
/* The main intf object */
intf_thread_t
*
p_intf
;
/* The main intf object */
...
@@ -105,7 +106,7 @@ struct intf_sys_t
...
@@ -105,7 +106,7 @@ struct intf_sys_t
id
o_bookmarks
;
/* VLCBookmarks */
id
o_bookmarks
;
/* VLCBookmarks */
id
o_embedded_list
;
/* VLCEmbeddedList*/
id
o_embedded_list
;
/* VLCEmbeddedList*/
id
o_interaction_list
;
/* VLCInteractionList*/
id
o_interaction_list
;
/* VLCInteractionList*/
id
o_info
;
/* VLCInformation */
VLCInformation
*
o_info
;
/* VLCInformation */
#ifdef UPDATE_CHECK
#ifdef UPDATE_CHECK
id
o_update
;
/* VLCUpdate */
id
o_update
;
/* VLCUpdate */
#endif
#endif
...
...
modules/gui/macosx/intf.m
View file @
4ad2f8dc
...
@@ -1751,9 +1751,9 @@ end:
...
@@ -1751,9 +1751,9 @@ end:
if
(
nib_bookmarks_loaded
)
if
(
nib_bookmarks_loaded
)
[
o_bookmarks
release
];
[
o_bookmarks
release
];
if
(
nib_info_loaded
)
if
(
o_info
)
{
{
[
o_info
stop
];
[
o_info
stop
Timers
];
[
o_info
release
];
[
o_info
release
];
}
}
...
...
modules/gui/macosx/playlistinfo.h
View file @
4ad2f8dc
...
@@ -102,6 +102,8 @@
...
@@ -102,6 +102,8 @@
}
}
-
(
void
)
initPanel
;
-
(
void
)
initPanel
;
-
(
void
)
stopTimers
;
-
(
IBAction
)
metaFieldChanged
:(
id
)
sender
;
-
(
IBAction
)
metaFieldChanged
:(
id
)
sender
;
-
(
IBAction
)
saveMetaData
:(
id
)
sender
;
-
(
IBAction
)
saveMetaData
:(
id
)
sender
;
-
(
void
)
initMediaPanelStats
;
-
(
void
)
initMediaPanelStats
;
...
...
modules/gui/macosx/playlistinfo.m
View file @
4ad2f8dc
...
@@ -119,7 +119,7 @@ static VLCInfo *_o_sharedInstance = nil;
...
@@ -119,7 +119,7 @@ static VLCInfo *_o_sharedInstance = nil;
[
self
updatePanelWithItem
:
p_item
];
[
self
updatePanelWithItem
:
p_item
];
}
}
-
(
void
)
stop
-
(
void
)
stop
Timers
{
{
/* make sure that the timer is released in any case */
/* make sure that the timer is released in any case */
if
(
o_statUpdateTimer
&&
[
o_statUpdateTimer
isValid
]
)
if
(
o_statUpdateTimer
&&
[
o_statUpdateTimer
isValid
]
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment