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
644bd843
Commit
644bd843
authored
Mar 15, 2010
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
legacy OS X intf: removed nslog-based debug
parent
09560b2b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
55 additions
and
60 deletions
+55
-60
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+0
-2
modules/gui/macosx/simple_prefs.m
modules/gui/macosx/simple_prefs.m
+54
-53
modules/gui/macosx/vout.m
modules/gui/macosx/vout.m
+1
-5
No files found.
modules/gui/macosx/intf.m
View file @
644bd843
...
@@ -1602,8 +1602,6 @@ static void manage_cleanup( void * args )
...
@@ -1602,8 +1602,6 @@ static void manage_cleanup( void * args )
}
}
pthread_cleanup_pop
(
1
);
pthread_cleanup_pop
(
1
);
msg_Dbg
(
p_intf
,
"OS X Manage thread terminating"
);
}
}
-
(
void
)
manageVolumeSlider
-
(
void
)
manageVolumeSlider
...
...
modules/gui/macosx/simple_prefs.m
View file @
644bd843
...
@@ -358,7 +358,8 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
...
@@ -358,7 +358,8 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
}
}
else
if
(
p_item
->
ppsz_list
[
i
]
)
else
if
(
p_item
->
ppsz_list
[
i
]
)
mi
=
[[
NSMenuItem
alloc
]
initWithTitle
:
[
NSString
stringWithUTF8String
:
p_item
->
ppsz_list
[
i
]]
action
:
NULL
keyEquivalent
:
@""
];
mi
=
[[
NSMenuItem
alloc
]
initWithTitle
:
[
NSString
stringWithUTF8String
:
p_item
->
ppsz_list
[
i
]]
action
:
NULL
keyEquivalent
:
@""
];
else
NSLog
(
@"item %d of pref %s failed to be created"
,
i
,
name
);
else
msg_Err
(
p_intf
,
"item %d of pref %s failed to be created"
,
i
,
name
);
[
mi
setRepresentedObject
:[
NSString
stringWithUTF8String
:
p_item
->
ppsz_list
[
i
]]];
[
mi
setRepresentedObject
:[
NSString
stringWithUTF8String
:
p_item
->
ppsz_list
[
i
]]];
[[
object
menu
]
addItem
:
[
mi
autorelease
]];
[[
object
menu
]
addItem
:
[
mi
autorelease
]];
if
(
p_item
->
value
.
psz
&&
!
strcmp
(
p_item
->
value
.
psz
,
p_item
->
ppsz_list
[
i
]
)
)
if
(
p_item
->
value
.
psz
&&
!
strcmp
(
p_item
->
value
.
psz
,
p_item
->
ppsz_list
[
i
]
)
)
...
@@ -384,7 +385,8 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
...
@@ -384,7 +385,8 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
mi
=
[[
NSMenuItem
alloc
]
initWithTitle
:
_NS
(
p_item
->
ppsz_list_text
[
i
]
)
action
:
NULL
keyEquivalent
:
@""
];
mi
=
[[
NSMenuItem
alloc
]
initWithTitle
:
_NS
(
p_item
->
ppsz_list_text
[
i
]
)
action
:
NULL
keyEquivalent
:
@""
];
else
if
(
p_item
->
pi_list
[
i
]
)
else
if
(
p_item
->
pi_list
[
i
]
)
mi
=
[[
NSMenuItem
alloc
]
initWithTitle
:
[
NSString
stringWithFormat
:
@"%d"
,
p_item
->
pi_list
[
i
]]
action
:
NULL
keyEquivalent
:
@""
];
mi
=
[[
NSMenuItem
alloc
]
initWithTitle
:
[
NSString
stringWithFormat
:
@"%d"
,
p_item
->
pi_list
[
i
]]
action
:
NULL
keyEquivalent
:
@""
];
else
NSLog
(
@"item %d of pref %s failed to be created"
,
i
,
name
);
else
msg_Err
(
p_intf
,
"item %d of pref %s failed to be created"
,
i
,
name
);
[
mi
setRepresentedObject
:[
NSNumber
numberWithInt
:
p_item
->
pi_list
[
i
]]];
[
mi
setRepresentedObject
:[
NSNumber
numberWithInt
:
p_item
->
pi_list
[
i
]]];
[[
object
menu
]
addItem
:
[
mi
autorelease
]];
[[
object
menu
]
addItem
:
[
mi
autorelease
]];
if
(
p_item
->
value
.
i
==
p_item
->
pi_list
[
i
]
)
if
(
p_item
->
value
.
i
==
p_item
->
pi_list
[
i
]
)
...
@@ -406,7 +408,7 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
...
@@ -406,7 +408,7 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
if
(
!
p_item
||!
p_list
)
if
(
!
p_item
||!
p_list
)
{
{
if
(
p_list
)
module_list_free
(
p_list
);
if
(
p_list
)
module_list_free
(
p_list
);
NSLog
(
@
"serious problem, item or list not found"
);
msg_Err
(
p_intf
,
"serious problem, item or list not found"
);
return
;
return
;
}
}
...
@@ -825,7 +827,6 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
...
@@ -825,7 +827,6 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
{
{
config_PutInt
(
p_intf
,
"audio"
,
[
o_audio_enable_ckb
state
]
);
config_PutInt
(
p_intf
,
"audio"
,
[
o_audio_enable_ckb
state
]
);
config_PutInt
(
p_intf
,
"volume"
,
([
o_audio_vol_sld
intValue
]
*
2
.
56
));
config_PutInt
(
p_intf
,
"volume"
,
([
o_audio_vol_sld
intValue
]
*
2
.
56
));
NSLog
(
@"slider=%i, pref=%i"
,
[
o_audio_vol_sld
intValue
],
config_GetInt
(
p_intf
,
"volume"
));
config_PutInt
(
p_intf
,
"spdif"
,
[
o_audio_spdif_ckb
state
]
);
config_PutInt
(
p_intf
,
"spdif"
,
[
o_audio_spdif_ckb
state
]
);
SaveIntList
(
o_audio_dolby_pop
,
"force-dolby-surround"
);
SaveIntList
(
o_audio_dolby_pop
,
"force-dolby-surround"
);
...
...
modules/gui/macosx/vout.m
View file @
644bd843
...
@@ -122,10 +122,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
...
@@ -122,10 +122,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
-
(
BOOL
)
windowContainsEmbedded
:
(
id
)
o_window
-
(
BOOL
)
windowContainsEmbedded
:
(
id
)
o_window
{
{
/* if( ![[o_window className] isEqualToString: @"VLCVoutWindow"] )
{
NSLog( @"We were not given a VLCVoutWindow" );
}*/
return
([
self
viewForWindow
:
o_window
]
==
nil
?
NO
:
YES
);
return
([
self
viewForWindow
:
o_window
]
==
nil
?
NO
:
YES
);
}
}
...
@@ -510,7 +506,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
...
@@ -510,7 +506,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
val
.
i_int
|=
(
int
)
CocoaKeyToVLC
(
key
);
val
.
i_int
|=
(
int
)
CocoaKeyToVLC
(
key
);
var_Set
(
p_vout
->
p_libvlc
,
"key-pressed"
,
val
);
var_Set
(
p_vout
->
p_libvlc
,
"key-pressed"
,
val
);
}
}
else
NSLog
(
@"C
ould not send keyevent to VLC core"
);
else
msg_Warn
(
p_vout
,
"c
ould not send keyevent to VLC core"
);
}
}
else
else
[
super
keyDown
:
o_event
];
[
super
keyDown
:
o_event
];
...
...
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