Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
37641596
Commit
37641596
authored
Aug 24, 2013
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fix moaar utf8 rendering issues
parent
57b3ee3b
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
10 deletions
+9
-10
modules/gui/macosx/AudioEffects.m
modules/gui/macosx/AudioEffects.m
+1
-1
modules/gui/macosx/ConvertAndSave.m
modules/gui/macosx/ConvertAndSave.m
+1
-1
modules/gui/macosx/MainMenu.m
modules/gui/macosx/MainMenu.m
+1
-1
modules/gui/macosx/StringUtility.h
modules/gui/macosx/StringUtility.h
+3
-0
modules/gui/macosx/bookmarks.m
modules/gui/macosx/bookmarks.m
+3
-3
modules/gui/macosx/coredialogs.m
modules/gui/macosx/coredialogs.m
+0
-4
No files found.
modules/gui/macosx/AudioEffects.m
View file @
37641596
...
@@ -473,7 +473,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
...
@@ -473,7 +473,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
NSString
*
currentPreset
=
nil
;
NSString
*
currentPreset
=
nil
;
if
(
p_aout
)
{
if
(
p_aout
)
{
char
*
psz_preset_string
=
var_GetNonEmptyString
(
p_aout
,
"equalizer-preset"
);
char
*
psz_preset_string
=
var_GetNonEmptyString
(
p_aout
,
"equalizer-preset"
);
currentPreset
=
[
NSString
stringWithFormat
:
@"%s"
,
psz_preset_string
]
;
currentPreset
=
toNSStr
(
psz_preset_string
)
;
free
(
psz_preset_string
);
free
(
psz_preset_string
);
vlc_object_release
(
p_aout
);
vlc_object_release
(
p_aout
);
}
}
...
...
modules/gui/macosx/ConvertAndSave.m
View file @
37641596
...
@@ -572,7 +572,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
...
@@ -572,7 +572,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
if
(
p_item
)
{
if
(
p_item
)
{
if
(
p_item
->
p_input
)
{
if
(
p_item
->
p_input
)
{
if
(
p_item
->
p_input
->
psz_uri
!=
nil
)
{
if
(
p_item
->
p_input
->
psz_uri
!=
nil
)
{
[
self
setMRL
:
[
NSString
stringWithFormat
:
@"%s"
,
p_item
->
p_input
->
psz_uri
]
];
[
self
setMRL
:
toNSStr
(
p_item
->
p_input
->
psz_uri
)
];
[
self
updateDropView
];
[
self
updateDropView
];
[
self
updateOKButton
];
[
self
updateOKButton
];
...
...
modules/gui/macosx/MainMenu.m
View file @
37641596
...
@@ -801,7 +801,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
...
@@ -801,7 +801,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
NSMenuItem
*
o_mi_tmp
;
NSMenuItem
*
o_mi_tmp
;
for
(
NSUInteger
x
=
0
;
x
<
n
;
x
++
)
{
for
(
NSUInteger
x
=
0
;
x
<
n
;
x
++
)
{
o_mi_tmp
=
[
o_mu_device
addItemWithTitle
:
[
NSString
stringWithFormat
:
@"%s"
,
names
[
x
]]
action
:
@selector
(
toggleAudioDevice
:
)
keyEquivalent
:
@""
];
o_mi_tmp
=
[
o_mu_device
addItemWithTitle
:
toNSStr
(
names
[
x
])
action
:
@selector
(
toggleAudioDevice
:
)
keyEquivalent
:
@""
];
[
o_mi_tmp
setTarget
:
self
];
[
o_mi_tmp
setTarget
:
self
];
[
o_mi_tmp
setTag
:[[
NSString
stringWithFormat
:
@"%s"
,
ids
[
x
]]
intValue
]];
[
o_mi_tmp
setTag
:[[
NSString
stringWithFormat
:
@"%s"
,
ids
[
x
]]
intValue
]];
}
}
...
...
modules/gui/macosx/StringUtility.h
View file @
37641596
...
@@ -35,6 +35,9 @@
...
@@ -35,6 +35,9 @@
#define B64DecNSStr(s) [[VLCStringUtility sharedInstance] b64Decode: s]
#define B64DecNSStr(s) [[VLCStringUtility sharedInstance] b64Decode: s]
#define B64EncAndFree(s) [[VLCStringUtility sharedInstance] b64EncodeAndFree: s]
#define B64EncAndFree(s) [[VLCStringUtility sharedInstance] b64EncodeAndFree: s]
inline
NSString
*
toNSStr
(
const
char
*
str
)
{
return
str
!=
NULL
?
[
NSString
stringWithUTF8String
:
str
]
:
@""
;
}
unsigned
int
CocoaKeyToVLC
(
unichar
i_key
);
unsigned
int
CocoaKeyToVLC
(
unichar
i_key
);
...
...
modules/gui/macosx/bookmarks.m
View file @
37641596
...
@@ -181,7 +181,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
...
@@ -181,7 +181,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
return
;
return
;
}
}
[
o_edit_fld_name
setStringValue
:
[
NSString
stringWithFormat
:
@"%s"
,
pp_bookmarks
[
row
]
->
psz_name
]
];
[
o_edit_fld_name
setStringValue
:
toNSStr
(
pp_bookmarks
[
row
]
->
psz_name
)
];
int
total
=
pp_bookmarks
[
row
]
->
i_time_offset
/
1000000
;
int
total
=
pp_bookmarks
[
row
]
->
i_time_offset
/
1000000
;
int
hour
=
total
/
(
60
*
60
);
int
hour
=
total
/
(
60
*
60
);
int
min
=
(
total
-
hour
*
60
*
60
)
/
60
;
int
min
=
(
total
-
hour
*
60
*
60
)
/
60
;
...
@@ -306,7 +306,7 @@ clear:
...
@@ -306,7 +306,7 @@ clear:
}
}
char
*
psz_uri
=
input_item_GetURI
(
input_GetItem
(
p_input
));
char
*
psz_uri
=
input_item_GetURI
(
input_GetItem
(
p_input
));
[[[
VLCMain
sharedInstance
]
wizard
]
initWithExtractValuesFrom
:
[
NSString
stringWithFormat
:
@"%lli"
,
pp_bookmarks
[
i_first
]
->
i_time_offset
/
1000000
]
to
:
[
NSString
stringWithFormat
:
@"%lli"
,
pp_bookmarks
[
i_second
]
->
i_time_offset
/
1000000
]
ofItem
:
[
NSString
stringWithFormat
:
@"%s"
,
psz_uri
]
];
[[[
VLCMain
sharedInstance
]
wizard
]
initWithExtractValuesFrom
:
[
NSString
stringWithFormat
:
@"%lli"
,
pp_bookmarks
[
i_first
]
->
i_time_offset
/
1000000
]
to
:
[
NSString
stringWithFormat
:
@"%lli"
,
pp_bookmarks
[
i_second
]
->
i_time_offset
/
1000000
]
ofItem
:
toNSStr
(
psz_uri
)
];
free
(
psz_uri
);
free
(
psz_uri
);
vlc_object_release
(
p_input
);
vlc_object_release
(
p_input
);
...
@@ -395,7 +395,7 @@ clear:
...
@@ -395,7 +395,7 @@ clear:
else
{
else
{
NSString
*
identifier
=
[
theTableColumn
identifier
];
NSString
*
identifier
=
[
theTableColumn
identifier
];
if
([
identifier
isEqualToString
:
@"description"
])
if
([
identifier
isEqualToString
:
@"description"
])
ret
=
[
NSString
stringWithFormat
:
@"%s"
,
pp_bookmarks
[
row
]
->
psz_name
]
;
ret
=
toNSStr
(
pp_bookmarks
[
row
]
->
psz_name
)
;
else
if
([
identifier
isEqualToString
:
@"size_offset"
])
else
if
([
identifier
isEqualToString
:
@"size_offset"
])
ret
=
[
NSString
stringWithFormat
:
@"%lli"
,
pp_bookmarks
[
row
]
->
i_byte_offset
];
ret
=
[
NSString
stringWithFormat
:
@"%lli"
,
pp_bookmarks
[
row
]
->
i_byte_offset
];
else
if
([
identifier
isEqualToString
:
@"time_offset"
])
{
else
if
([
identifier
isEqualToString
:
@"time_offset"
])
{
...
...
modules/gui/macosx/coredialogs.m
View file @
37641596
...
@@ -29,10 +29,6 @@
...
@@ -29,10 +29,6 @@
/* for the icon in our custom error panel */
/* for the icon in our custom error panel */
#import <ApplicationServices/ApplicationServices.h>
#import <ApplicationServices/ApplicationServices.h>
NSString
*
toNSStr
(
const
char
*
str
)
{
return
str
!=
NULL
?
[
NSString
stringWithUTF8String
:
str
]
:
@""
;
}
/*****************************************************************************
/*****************************************************************************
* VLCCoreDialogProvider implementation
* VLCCoreDialogProvider implementation
*****************************************************************************/
*****************************************************************************/
...
...
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