Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
587ff0ca
Commit
587ff0ca
authored
Feb 02, 2003
by
Christophe Massiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Worked around a bug with the Screens menu and localization.
parent
3593c15f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+3
-2
modules/gui/macosx/vout.m
modules/gui/macosx/vout.m
+3
-3
No files found.
modules/gui/macosx/intf.m
View file @
587ff0ca
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* intf.m: MacOS X interface plugin
* intf.m: MacOS X interface plugin
*****************************************************************************
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* Copyright (C) 2002-2003 VideoLAN
* $Id: intf.m,v 1.4
3 2003/02/01 23:46:24
massiot Exp $
* $Id: intf.m,v 1.4
4 2003/02/02 23:11:17
massiot Exp $
*
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
* Christophe Massiot <massiot@via.ecp.fr>
...
@@ -1253,7 +1253,8 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
...
@@ -1253,7 +1253,8 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
NSMenuItem
*
o_lmi
;
NSMenuItem
*
o_lmi
;
NSString
*
o_title
;
NSString
*
o_title
;
o_title
=
[
NSApp
localizedString
:
val
.
p_list
->
p_values
[
i
].
psz_string
];
//o_title = [NSApp localizedString: val.p_list->p_values[i].psz_string];
o_title
=
[
NSString
stringWithCString
:
val
.
p_list
->
p_values
[
i
].
psz_string
];
o_lmi
=
[
o_menu
addItemWithTitle
:
o_title
o_lmi
=
[
o_menu
addItemWithTitle
:
o_title
action:
pf_callback
keyEquivalent
:
@""
];
action:
pf_callback
keyEquivalent
:
@""
];
/* FIXME: this isn't 64-bit clean ! */
/* FIXME: this isn't 64-bit clean ! */
...
...
modules/gui/macosx/vout.m
View file @
587ff0ca
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* vout.m: MacOS X video output plugin
* vout.m: MacOS X video output plugin
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
* Copyright (C) 2001-2003 VideoLAN
* $Id: vout.m,v 1.2
1 2003/01/31 02:53:52 jlj
Exp $
* $Id: vout.m,v 1.2
2 2003/02/02 23:11:17 massiot
Exp $
*
*
* Authors: Colin Delacroix <colin@zoy.org>
* Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org>
* Florian G. Pflug <fgp@phlo.org>
...
@@ -191,7 +191,7 @@ int E_(OpenVideo) ( vlc_object_t *p_this )
...
@@ -191,7 +191,7 @@ int E_(OpenVideo) ( vlc_object_t *p_this )
NSRect
s_rect
=
[
o_screen
frame
];
NSRect
s_rect
=
[
o_screen
frame
];
snprintf
(
psz_temp
,
sizeof
(
psz_temp
)
/
sizeof
(
psz_temp
[
0
])
-
1
,
snprintf
(
psz_temp
,
sizeof
(
psz_temp
)
/
sizeof
(
psz_temp
[
0
])
-
1
,
"%s %d (%dx%d)"
,
_
(
"Screen"
)
,
i
,
"%s %d (%dx%d)"
,
"Screen"
,
i
,
(
int
)
s_rect
.
size
.
width
,
(
int
)
s_rect
.
size
.
height
);
(
int
)
s_rect
.
size
.
width
,
(
int
)
s_rect
.
size
.
height
);
val
.
psz_string
=
psz_temp
;
val
.
psz_string
=
psz_temp
;
...
@@ -932,7 +932,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -932,7 +932,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
unsigned
int
i_index
=
0
;
unsigned
int
i_index
=
0
;
NSArray
*
o_screens
=
[
NSScreen
screens
];
NSArray
*
o_screens
=
[
NSScreen
screens
];
if
(
!
sscanf
(
val
.
psz_string
,
_
(
"Screen %d"
)
,
&
i_index
)
||
if
(
!
sscanf
(
val
.
psz_string
,
"Screen %d"
,
&
i_index
)
||
[
o_screens
count
]
<
i_index
)
[
o_screens
count
]
<
i_index
)
{
{
o_screen
=
[
NSScreen
mainScreen
];
o_screen
=
[
NSScreen
mainScreen
];
...
...
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