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
cf04d7a8
Commit
cf04d7a8
authored
Feb 15, 2013
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix play / pause and rename method for better clarity
parent
57df1568
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
12 additions
and
12 deletions
+12
-12
modules/gui/macosx/ControlsBar.m
modules/gui/macosx/ControlsBar.m
+1
-1
modules/gui/macosx/CoreInteraction.h
modules/gui/macosx/CoreInteraction.h
+1
-1
modules/gui/macosx/CoreInteraction.m
modules/gui/macosx/CoreInteraction.m
+2
-2
modules/gui/macosx/VideoView.m
modules/gui/macosx/VideoView.m
+1
-1
modules/gui/macosx/applescript.m
modules/gui/macosx/applescript.m
+1
-1
modules/gui/macosx/controls.m
modules/gui/macosx/controls.m
+1
-1
modules/gui/macosx/fspanel.m
modules/gui/macosx/fspanel.m
+1
-1
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+4
-4
No files found.
modules/gui/macosx/ControlsBar.m
View file @
cf04d7a8
...
...
@@ -155,7 +155,7 @@
-
(
IBAction
)
play
:(
id
)
sender
{
[[
VLCCoreInteraction
sharedInstance
]
play
];
[[
VLCCoreInteraction
sharedInstance
]
play
OrPause
];
}
-
(
void
)
resetPreviousButton
...
...
modules/gui/macosx/CoreInteraction.h
View file @
cf04d7a8
...
...
@@ -38,7 +38,7 @@
@property
(
readonly
)
NSString
*
nameOfCurrentPlaylistItem
;
@property
(
nonatomic
,
readwrite
)
BOOL
mute
;
-
(
void
)
play
;
-
(
void
)
play
OrPause
;
-
(
void
)
pause
;
-
(
void
)
stop
;
-
(
void
)
faster
;
...
...
modules/gui/macosx/CoreInteraction.m
View file @
cf04d7a8
...
...
@@ -78,14 +78,14 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
#pragma mark -
#pragma mark Playback Controls
-
(
void
)
play
-
(
void
)
play
OrPause
{
input_thread_t
*
p_input
;
p_input
=
pl_CurrentInput
(
VLCIntf
);
playlist_t
*
p_playlist
=
pl_Get
(
VLCIntf
);
if
(
p_input
)
{
playlist_P
lay
(
p_playlist
);
playlist_P
ause
(
p_playlist
);
vlc_object_release
(
p_input
);
}
else
{
bool
empty
;
...
...
modules/gui/macosx/VideoView.m
View file @
cf04d7a8
...
...
@@ -134,7 +134,7 @@
[[
VLCCoreInteraction
sharedInstance
]
toggleFullscreen
];
else
if
(
p_vout
)
{
if
(
key
==
' '
)
[[
VLCCoreInteraction
sharedInstance
]
play
];
[[
VLCCoreInteraction
sharedInstance
]
play
OrPause
];
else
{
val
.
i_int
|=
(
int
)
CocoaKeyToVLC
(
key
);
var_Set
(
p_vout
->
p_libvlc
,
"key-pressed"
,
val
);
...
...
modules/gui/macosx/applescript.m
View file @
cf04d7a8
...
...
@@ -88,7 +88,7 @@
playlist_t
*
p_playlist
=
pl_Get
(
p_intf
);
if
([
o_command
isEqualToString
:
@"play"
])
[[
VLCCoreInteraction
sharedInstance
]
play
];
[[
VLCCoreInteraction
sharedInstance
]
play
OrPause
];
else
if
([
o_command
isEqualToString
:
@"stop"
])
[[
VLCCoreInteraction
sharedInstance
]
stop
];
else
if
([
o_command
isEqualToString
:
@"previous"
])
...
...
modules/gui/macosx/controls.m
View file @
cf04d7a8
...
...
@@ -66,7 +66,7 @@
-
(
IBAction
)
play
:(
id
)
sender
{
[[
VLCCoreInteraction
sharedInstance
]
play
];
[[
VLCCoreInteraction
sharedInstance
]
play
OrPause
];
}
-
(
IBAction
)
stop
:(
id
)
sender
...
...
modules/gui/macosx/fspanel.m
View file @
cf04d7a8
...
...
@@ -534,7 +534,7 @@
-
(
IBAction
)
play
:(
id
)
sender
{
[[
VLCCoreInteraction
sharedInstance
]
play
];
[[
VLCCoreInteraction
sharedInstance
]
play
OrPause
];
}
-
(
IBAction
)
forward
:(
id
)
sender
...
...
modules/gui/macosx/intf.m
View file @
cf04d7a8
...
...
@@ -932,7 +932,7 @@ static VLCMain *_o_sharedMainInstance = nil;
int
keyRepeat
=
(
keyFlags
&
0x1
);
if
(
keyCode
==
NX_KEYTYPE_PLAY
&&
keyState
==
0
)
[[
VLCCoreInteraction
sharedInstance
]
play
];
[[
VLCCoreInteraction
sharedInstance
]
play
OrPause
];
if
((
keyCode
==
NX_KEYTYPE_FAST
||
keyCode
==
NX_KEYTYPE_NEXT
)
&&
!
b_mediakeyJustJumped
)
{
if
(
keyState
==
0
&&
keyRepeat
==
0
)
...
...
@@ -1078,13 +1078,13 @@ static VLCMain *_o_sharedMainInstance = nil;
[[
VLCCoreInteraction
sharedInstance
]
toggleFullscreen
];
break
;
case
k2009RemoteButtonPlay
:
[[
VLCCoreInteraction
sharedInstance
]
play
];
[[
VLCCoreInteraction
sharedInstance
]
play
OrPause
];
break
;
case
kRemoteButtonPlay
:
if
(
count
>=
2
)
[[
VLCCoreInteraction
sharedInstance
]
toggleFullscreen
];
else
[[
VLCCoreInteraction
sharedInstance
]
play
];
[[
VLCCoreInteraction
sharedInstance
]
play
OrPause
];
break
;
case
kRemoteButtonVolume_Plus
:
if
(
config_GetInt
(
VLCIntf
,
"macosx-appleremote-sysvol"
))
...
...
@@ -1192,7 +1192,7 @@ static VLCMain *_o_sharedMainInstance = nil;
}
if
(
key
==
0x0020
)
{
// space key
[[
VLCCoreInteraction
sharedInstance
]
play
];
[[
VLCCoreInteraction
sharedInstance
]
play
OrPause
];
return
YES
;
}
...
...
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