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
4b4d217a
Commit
4b4d217a
authored
Jul 24, 2009
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fixed crash when reloading simple prefs
parent
33086188
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
203 additions
and
354 deletions
+203
-354
NEWS
NEWS
+1
-0
extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
...acosx/Resources/English.lproj/Preferences.nib/classes.nib
+182
-345
extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
...e/macosx/Resources/English.lproj/Preferences.nib/info.nib
+12
-2
extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib
.../Resources/English.lproj/Preferences.nib/keyedobjects.nib
+0
-0
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+2
-2
modules/gui/macosx/simple_prefs.m
modules/gui/macosx/simple_prefs.m
+6
-5
No files found.
NEWS
View file @
4b4d217a
...
...
@@ -23,6 +23,7 @@ Qt Interface:
Mac OS X Interface:
* Added options to disable support for Apple Remote and Media Keys
* More reliable Information and Messages panels
Translations updates for French, Korean, Brazillian, Norwegian Nynorsk
...
...
extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
View file @
4b4d217a
This diff is collapsed.
Click to expand it.
extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
View file @
4b4d217a
...
...
@@ -2,18 +2,28 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist
version=
"1.0"
>
<dict>
<key>
IBDocumentLocation
</key>
<string>
69 70 356 240 0 0 1280 778
</string>
<key>
IBEditorPositions
</key>
<dict>
<key>
2311
</key>
<string>
345 378 590 293 0 0 1280 778
</string>
<key>
2562
</key>
<string>
151 240 590 453 0 0 1280 778
</string>
</dict>
<key>
IBFramework Version
</key>
<string>
677
</string>
<string>
489.0
</string>
<key>
IBLastKnownRelativeProjectPath
</key>
<string>
../../vlc.xcodeproj
</string>
<key>
IBOldestOS
</key>
<integer>
5
</integer>
<key>
IBOpenObjects
</key>
<array>
<integer>
2562
</integer>
<integer>
2311
</integer>
</array>
<key>
IBSystem Version
</key>
<string>
9L2
5
</string>
<string>
9L2
7
</string>
<key>
targetFramework
</key>
<string>
IBCocoaFramework
</string>
</dict>
...
...
extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib
View file @
4b4d217a
No preview for this file type
modules/gui/macosx/intf.m
View file @
4b4d217a
...
...
@@ -2840,7 +2840,7 @@ end:
b_mediaKeySupport
=
config_GetInt
(
VLCIntf
,
"macosx-mediakeys"
);
}
/*
-
(
void
)
sendEvent
:
(
NSEvent
*
)
event
{
if
(
b_mediaKeySupport
)
...
...
@@ -2889,7 +2889,7 @@ end:
}
}
[
super
sendEvent
:
event
];
}
*/
}
-
(
void
)
resetJump
{
...
...
modules/gui/macosx/simple_prefs.m
View file @
4b4d217a
...
...
@@ -325,9 +325,10 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
}
else
if
(
p_item
->
ppsz_list
[
i
]
)
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
(
VLCIntf
,
"item %d of pref %s failed to be created"
,
i
,
name
);
[
mi
setRepresentedObject
:[
NSString
stringWithUTF8String
:
p_item
->
ppsz_list
[
i
]]];
[[
object
menu
]
addItem
:
[
mi
autorelease
]
];
[[
object
menu
]
addItem
:
mi
];
if
(
p_item
->
value
.
psz
&&
!
strcmp
(
p_item
->
value
.
psz
,
p_item
->
ppsz_list
[
i
]
)
)
[
object
selectItem
:[
object
lastItem
]];
}
...
...
@@ -747,9 +748,9 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
[[[
VLCMain
sharedInstance
]
appleRemoteController
]
startListening
:
[
VLCMain
sharedInstance
]];
else
[[[
VLCMain
sharedInstance
]
appleRemoteController
]
stopListening
:
[
VLCMain
sharedInstance
]];
//
[[NSNotificationCenter defaultCenter] postNotificationName: @"VLCMediaKeySupportSettingChanged"
// object: nil
//
userInfo: nil];
[[
NSNotificationCenter
defaultCenter
]
postNotificationName
:
@"VLCMediaKeySupportSettingChanged"
object:
nil
userInfo:
nil
];
/* okay, let's save our changes to vlcrc */
i
=
config_SaveConfigFile
(
p_intf
,
"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