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
6b7540a5
Commit
6b7540a5
authored
Jun 29, 2008
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't try to use 10.5-only threading features on a 10.4u target. Fixes #1614 on OS X.
parent
8d65a755
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
12 deletions
+10
-12
modules/gui/macosx/intf.h
modules/gui/macosx/intf.h
+0
-2
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+10
-10
No files found.
modules/gui/macosx/intf.h
View file @
6b7540a5
...
@@ -303,8 +303,6 @@ struct intf_sys_t
...
@@ -303,8 +303,6 @@ struct intf_sys_t
NSSize
o_size_with_playlist
;
NSSize
o_size_with_playlist
;
NSThread
*
manageThread
;
int
i_lastShownVolume
;
int
i_lastShownVolume
;
AppleRemote
*
o_remote
;
AppleRemote
*
o_remote
;
...
...
modules/gui/macosx/intf.m
View file @
6b7540a5
...
@@ -795,12 +795,12 @@ static VLCMain *_o_sharedMainInstance = nil;
...
@@ -795,12 +795,12 @@ static VLCMain *_o_sharedMainInstance = nil;
/* FIXME: don't poll */
/* FIXME: don't poll */
[
NSTimer
scheduledTimerWithTimeInterval
:
0
.
5
[
NSTimer
scheduledTimerWithTimeInterval
:
0
.
5
target:
self
selector
:
@selector
(
manageIntf
:
)
target:
self
selector
:
@selector
(
manageIntf
:
)
userInfo:
nil
repeats
:
FALSE
];
userInfo:
nil
repeats
:
FALSE
];
/* FIXME: don't poll */
/* FIXME: don't poll */
manageThread
=
[[
NSThread
alloc
]
initWithTarget
:
self
selector
:
@selector
(
manage
)
[
NSThread
detachNewThreadSelector
:
@selector
(
manage
)
o
bject:
nil
];
toTarget:
self
withO
bject
:
nil
];
[
o_controls
setupVarMenuItem
:
o_mi_add_intf
target
:
(
vlc_object_t
*
)
p_intf
[
o_controls
setupVarMenuItem
:
o_mi_add_intf
target
:
(
vlc_object_t
*
)
p_intf
var:
"intf-add"
selector
:
@selector
(
toggleVar
:
)];
var:
"intf-add"
selector
:
@selector
(
toggleVar
:
)];
...
@@ -1230,11 +1230,14 @@ static VLCMain *_o_sharedMainInstance = nil;
...
@@ -1230,11 +1230,14 @@ static VLCMain *_o_sharedMainInstance = nil;
p_playlist
=
pl_Yield
(
p_intf
);
p_playlist
=
pl_Yield
(
p_intf
);
var_AddCallback
(
p_playlist
,
"playlist-current"
,
PlaylistChanged
,
self
);
var_AddCallback
(
p_playlist
,
"intf-change"
,
PlaylistChanged
,
self
);
var_AddCallback
(
p_playlist
,
"intf-change"
,
PlaylistChanged
,
self
);
var_AddCallback
(
p_playlist
,
"item-change"
,
PlaylistChanged
,
self
);
var_AddCallback
(
p_playlist
,
"item-change"
,
PlaylistChanged
,
self
);
var_AddCallback
(
p_playlist
,
"item-append"
,
PlaylistChanged
,
self
);
var_AddCallback
(
p_playlist
,
"item-append"
,
PlaylistChanged
,
self
);
var_AddCallback
(
p_playlist
,
"item-deleted"
,
PlaylistChanged
,
self
);
var_AddCallback
(
p_playlist
,
"item-deleted"
,
PlaylistChanged
,
self
);
var_AddCallback
(
p_playlist
,
"playlist-current"
,
PlaylistChanged
,
self
);
// vlc_value_t val;
// var_Change( p_playlist, "playlist-current", VLC_VAR_CHOICESCOUNT, &val, NULL );
vlc_object_release
(
p_playlist
);
vlc_object_release
(
p_playlist
);
...
@@ -1247,7 +1250,7 @@ static VLCMain *_o_sharedMainInstance = nil;
...
@@ -1247,7 +1250,7 @@ static VLCMain *_o_sharedMainInstance = nil;
{
{
p_intf
->
p_sys
->
p_input
=
p_playlist
->
p_input
;
p_intf
->
p_sys
->
p_input
=
p_playlist
->
p_input
;
/* Refresh the interface */
/* Refresh the interface */
if
(
p_intf
->
p_sys
->
p_input
)
if
(
p_intf
->
p_sys
->
p_input
)
{
{
msg_Dbg
(
p_intf
,
"input has changed, refreshing interface"
);
msg_Dbg
(
p_intf
,
"input has changed, refreshing interface"
);
...
@@ -1451,7 +1454,6 @@ static VLCMain *_o_sharedMainInstance = nil;
...
@@ -1451,7 +1454,6 @@ static VLCMain *_o_sharedMainInstance = nil;
else
else
{
{
p_intf
->
p_sys
->
i_play_status
=
END_S
;
p_intf
->
p_sys
->
i_play_status
=
END_S
;
p_intf
->
p_sys
->
b_intf_update
=
true
;
p_intf
->
p_sys
->
b_playlist_update
=
true
;
p_intf
->
p_sys
->
b_playlist_update
=
true
;
[
self
playStatusUpdated
:
p_intf
->
p_sys
->
i_play_status
];
[
self
playStatusUpdated
:
p_intf
->
p_sys
->
i_play_status
];
[
o_embedded_window
playStatusUpdated
:
p_intf
->
p_sys
->
i_play_status
];
[
o_embedded_window
playStatusUpdated
:
p_intf
->
p_sys
->
i_play_status
];
...
@@ -1601,6 +1603,7 @@ static VLCMain *_o_sharedMainInstance = nil;
...
@@ -1601,6 +1603,7 @@ static VLCMain *_o_sharedMainInstance = nil;
o_temp
=
[
NSString
stringWithUTF8String
:
o_temp
=
[
NSString
stringWithUTF8String
:
p_playlist
->
status
.
p_item
->
p_input
->
psz_name
];
p_playlist
->
status
.
p_item
->
p_input
->
psz_name
];
[
self
setScrollField
:
o_temp
stopAfter
:
-
1
];
[
self
setScrollField
:
o_temp
stopAfter
:
-
1
];
[[[
self
getControls
]
getFSPanel
]
setStreamTitle
:
o_temp
];
vlc_object_release
(
p_input
);
vlc_object_release
(
p_input
);
vlc_object_release
(
p_playlist
);
vlc_object_release
(
p_playlist
);
return
;
return
;
...
@@ -1777,9 +1780,6 @@ static VLCMain *_o_sharedMainInstance = nil;
...
@@ -1777,9 +1780,6 @@ static VLCMain *_o_sharedMainInstance = nil;
msg_Dbg
(
p_intf
,
"Terminating"
);
msg_Dbg
(
p_intf
,
"Terminating"
);
[
manageThread
cancel
];
[
manageThread
release
];
/* make sure that the current volume is saved */
/* make sure that the current volume is saved */
config_PutInt
(
p_intf
->
p_libvlc
,
"volume"
,
i_lastShownVolume
);
config_PutInt
(
p_intf
->
p_libvlc
,
"volume"
,
i_lastShownVolume
);
returnedValue
=
config_SaveConfigFile
(
p_intf
->
p_libvlc
,
"main"
);
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