Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
a409380d
Commit
a409380d
authored
Jul 05, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: Make sure the manageIntf: Timer is getting cancelled at exit.
parent
7a4d005e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
modules/gui/macosx/intf.h
modules/gui/macosx/intf.h
+3
-0
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+11
-4
No files found.
modules/gui/macosx/intf.h
View file @
a409380d
...
...
@@ -307,6 +307,9 @@ struct intf_sys_t
/* the manage thread */
pthread_t
manage_thread
;
/* The timer that update the interface */
NSTimer
*
interfaceTimer
;
AppleRemote
*
o_remote
;
BOOL
b_remote_button_hold
;
/* true as long as the user holds the left,right,plus or minus on the remote control */
}
...
...
modules/gui/macosx/intf.m
View file @
a409380d
...
...
@@ -778,9 +778,9 @@ static VLCMain *_o_sharedMainInstance = nil;
forMode:
NSDefaultRunLoopMode
];
/* FIXME: don't poll */
[
NSTimer
scheduledTimerWithTimeInterval
:
0
.
5
interfaceTimer
=
[
[
NSTimer
scheduledTimerWithTimeInterval
:
0
.
5
target:
self
selector
:
@selector
(
manageIntf
:)
userInfo:
nil
repeats
:
FALSE
];
userInfo:
nil
repeats
:
FALSE
]
retain
]
;
/* Note: we use the pthread API to support pre-10.5 */
pthread_create
(
&
manage_thread
,
NULL
,
ManageThread
,
self
);
...
...
@@ -1443,9 +1443,11 @@ static VLCMain *_o_sharedMainInstance = nil;
if
(
((
i_end_scroll
!=
-
1
)
&&
(
mdate
()
>
i_end_scroll
))
||
!
p_input
)
[
self
resetScrollField
];
[
NSTimer
scheduledTimerWithTimeInterval
:
0
.
3
[
interfaceTimer
autorelease
];
interfaceTimer
=
[[
NSTimer
scheduledTimerWithTimeInterval
:
0
.
3
target:
self
selector
:
@selector
(
manageIntf
:)
userInfo:
nil
repeats
:
FALSE
];
userInfo:
nil
repeats
:
FALSE
]
retain
]
;
}
-
(
void
)
setupMenus
...
...
@@ -1765,6 +1767,11 @@ static VLCMain *_o_sharedMainInstance = nil;
/* Make sure our manage_thread ends */
pthread_join
(
manage_thread
,
NULL
);
/* Make sure the interfaceTimer is destroyed */
[
interfaceTimer
invalidate
];
[
interfaceTimer
release
];
interfaceTimer
=
nil
;
/* make sure that the current volume is saved */
config_PutInt
(
p_intf
->
p_libvlc
,
"volume"
,
i_lastShownVolume
);
returnedValue
=
config_SaveConfigFile
(
p_intf
->
p_libvlc
,
"main"
);
...
...
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