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
b3259ed4
Commit
b3259ed4
authored
May 17, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: improve memory and hotkey handling (in case a vout is active, but not the first responder)
parent
1b2ae82c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
3 deletions
+16
-3
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+16
-3
No files found.
modules/gui/macosx/intf.m
View file @
b3259ed4
...
@@ -651,6 +651,8 @@ static VLCMain *_o_sharedMainInstance = nil;
...
@@ -651,6 +651,8 @@ static VLCMain *_o_sharedMainInstance = nil;
{
{
if
(
!
p_intf
)
return
;
if
(
!
p_intf
)
return
;
[
self
updateCurrentlyUsedHotkeys
];
[
o_mainwindow
updateWindow
];
[
o_mainwindow
updateWindow
];
[
o_mainwindow
updateTimeSlider
];
[
o_mainwindow
updateTimeSlider
];
[
o_mainwindow
updateVolumeSlider
];
[
o_mainwindow
updateVolumeSlider
];
...
@@ -1295,8 +1297,8 @@ unsigned int CocoaKeyToVLC( unichar i_key )
...
@@ -1295,8 +1297,8 @@ unsigned int CocoaKeyToVLC( unichar i_key )
unsigned
int
i_pressed_modifiers
=
0
;
unsigned
int
i_pressed_modifiers
=
0
;
const
struct
hotkey
*
p_hotkeys
;
const
struct
hotkey
*
p_hotkeys
;
int
i
;
int
i
;
NSMutableString
*
tempString
=
[[
[
NSMutableString
alloc
]
init
]
autorelease
];
NSMutableString
*
tempString
=
[[
NSMutableString
alloc
]
init
];
NSMutableString
*
tempStringPlus
=
[[
[
NSMutableString
alloc
]
init
]
autorelease
];
NSMutableString
*
tempStringPlus
=
[[
NSMutableString
alloc
]
init
];
val
.
i_int
=
0
;
val
.
i_int
=
0
;
p_hotkeys
=
p_intf
->
p_libvlc
->
p_hotkeys
;
p_hotkeys
=
p_intf
->
p_libvlc
->
p_hotkeys
;
...
@@ -1333,6 +1335,8 @@ unsigned int CocoaKeyToVLC( unichar i_key )
...
@@ -1333,6 +1335,8 @@ unsigned int CocoaKeyToVLC( unichar i_key )
if
(
key
==
'f'
&&
i_pressed_modifiers
&
NSControlKeyMask
&&
i_pressed_modifiers
&
NSCommandKeyMask
)
if
(
key
==
'f'
&&
i_pressed_modifiers
&
NSControlKeyMask
&&
i_pressed_modifiers
&
NSCommandKeyMask
)
{
{
[[
VLCCoreInteraction
sharedInstance
]
toggleFullscreen
];
[[
VLCCoreInteraction
sharedInstance
]
toggleFullscreen
];
[
tempString
release
];
[
tempStringPlus
release
];
return
YES
;
return
YES
;
}
}
...
@@ -1348,12 +1352,16 @@ unsigned int CocoaKeyToVLC( unichar i_key )
...
@@ -1348,12 +1352,16 @@ unsigned int CocoaKeyToVLC( unichar i_key )
case
NSLeftArrowFunctionKey
:
case
NSLeftArrowFunctionKey
:
case
NSEnterCharacter
:
case
NSEnterCharacter
:
case
NSCarriageReturnCharacter
:
case
NSCarriageReturnCharacter
:
[
tempString
release
];
[
tempStringPlus
release
];
return
NO
;
return
NO
;
}
}
if
(
key
==
0x0020
)
// space key
if
(
key
==
0x0020
)
// space key
{
{
[[
VLCCoreInteraction
sharedInstance
]
play
];
[[
VLCCoreInteraction
sharedInstance
]
play
];
[
tempString
release
];
[
tempStringPlus
release
];
return
YES
;
return
YES
;
}
}
...
@@ -1362,9 +1370,13 @@ unsigned int CocoaKeyToVLC( unichar i_key )
...
@@ -1362,9 +1370,13 @@ unsigned int CocoaKeyToVLC( unichar i_key )
if
(
[
o_usedHotkeys
indexOfObject
:
tempString
]
!=
NSNotFound
||
[
o_usedHotkeys
indexOfObject
:
tempStringPlus
]
!=
NSNotFound
)
if
(
[
o_usedHotkeys
indexOfObject
:
tempString
]
!=
NSNotFound
||
[
o_usedHotkeys
indexOfObject
:
tempStringPlus
]
!=
NSNotFound
)
{
{
var_SetInteger
(
p_intf
->
p_libvlc
,
"key-pressed"
,
val
.
i_int
);
var_SetInteger
(
p_intf
->
p_libvlc
,
"key-pressed"
,
val
.
i_int
);
[
tempString
release
];
[
tempStringPlus
release
];
return
YES
;
return
YES
;
}
}
[
tempString
release
];
[
tempStringPlus
release
];
return
NO
;
return
NO
;
}
}
...
@@ -1392,7 +1404,8 @@ unsigned int CocoaKeyToVLC( unichar i_key )
...
@@ -1392,7 +1404,8 @@ unsigned int CocoaKeyToVLC( unichar i_key )
}
}
}
}
module_config_free
(
p_config
);
module_config_free
(
p_config
);
o_usedHotkeys
=
[[
NSArray
alloc
]
initWithArray
:
o_usedHotkeys
copyItems
:
YES
];
o_usedHotkeys
=
[[
NSArray
alloc
]
initWithArray
:
o_tempArray
copyItems
:
YES
];
[
o_tempArray
release
];
}
}
#pragma mark -
#pragma mark -
...
...
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