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
6ebb7049
Commit
6ebb7049
authored
Nov 15, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: implemented A->B Loop (close #5187)
parent
29744275
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
1403 additions
and
11 deletions
+1403
-11
extras/package/macosx/Resources/English.lproj/MainMenu.xib
extras/package/macosx/Resources/English.lproj/MainMenu.xib
+1358
-11
modules/gui/macosx/CoreInteraction.h
modules/gui/macosx/CoreInteraction.h
+3
-0
modules/gui/macosx/CoreInteraction.m
modules/gui/macosx/CoreInteraction.m
+33
-0
modules/gui/macosx/MainMenu.h
modules/gui/macosx/MainMenu.h
+2
-0
modules/gui/macosx/MainMenu.m
modules/gui/macosx/MainMenu.m
+6
-0
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+1
-0
No files found.
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @
6ebb7049
This diff is collapsed.
Click to expand it.
modules/gui/macosx/CoreInteraction.h
View file @
6ebb7049
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
@interface
VLCCoreInteraction
:
NSObject
{
@interface
VLCCoreInteraction
:
NSObject
{
int
i_currentPlaybackRate
;
int
i_currentPlaybackRate
;
mtime_t
timeA
,
timeB
;
}
}
+
(
VLCCoreInteraction
*
)
sharedInstance
;
+
(
VLCCoreInteraction
*
)
sharedInstance
;
@property
(
readwrite
)
int
volume
;
@property
(
readwrite
)
int
volume
;
...
@@ -61,6 +62,8 @@
...
@@ -61,6 +62,8 @@
-
(
void
)
repeatAll
;
-
(
void
)
repeatAll
;
-
(
void
)
repeatOff
;
-
(
void
)
repeatOff
;
-
(
void
)
shuffle
;
-
(
void
)
shuffle
;
-
(
void
)
setAtoB
;
-
(
void
)
updateAtoB
;
-
(
void
)
volumeUp
;
-
(
void
)
volumeUp
;
-
(
void
)
volumeDown
;
-
(
void
)
volumeDown
;
...
...
modules/gui/macosx/CoreInteraction.m
View file @
6ebb7049
...
@@ -417,6 +417,39 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
...
@@ -417,6 +417,39 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
}
}
}
}
-
(
void
)
setAtoB
{
if
(
!
timeA
)
{
input_thread_t
*
p_input
=
pl_CurrentInput
(
VLCIntf
);
if
(
p_input
)
{
timeA
=
var_GetTime
(
p_input
,
"time"
);
vlc_object_release
(
p_input
);
}
}
else
if
(
!
timeB
)
{
input_thread_t
*
p_input
=
pl_CurrentInput
(
VLCIntf
);
if
(
p_input
)
{
timeB
=
var_GetTime
(
p_input
,
"time"
);
vlc_object_release
(
p_input
);
}
}
else
{
timeA
=
0
;
timeB
=
0
;
}
}
-
(
void
)
updateAtoB
{
if
(
timeB
)
{
input_thread_t
*
p_input
=
pl_CurrentInput
(
VLCIntf
);
if
(
p_input
)
{
mtime_t
currentTime
=
var_GetTime
(
p_input
,
"time"
);
if
(
currentTime
>=
timeB
||
currentTime
<
timeA
)
var_SetTime
(
p_input
,
"time"
,
timeA
);
vlc_object_release
(
p_input
);
}
}
}
-
(
void
)
volumeUp
-
(
void
)
volumeUp
{
{
intf_thread_t
*
p_intf
=
VLCIntf
;
intf_thread_t
*
p_intf
=
VLCIntf
;
...
...
modules/gui/macosx/MainMenu.h
View file @
6ebb7049
...
@@ -102,6 +102,7 @@
...
@@ -102,6 +102,7 @@
IBOutlet
NSMenuItem
*
o_mi_random
;
IBOutlet
NSMenuItem
*
o_mi_random
;
IBOutlet
NSMenuItem
*
o_mi_repeat
;
IBOutlet
NSMenuItem
*
o_mi_repeat
;
IBOutlet
NSMenuItem
*
o_mi_loop
;
IBOutlet
NSMenuItem
*
o_mi_loop
;
IBOutlet
NSMenuItem
*
o_mi_AtoBloop
;
IBOutlet
NSMenuItem
*
o_mi_quitAfterPB
;
IBOutlet
NSMenuItem
*
o_mi_quitAfterPB
;
IBOutlet
NSMenuItem
*
o_mi_fwd
;
IBOutlet
NSMenuItem
*
o_mi_fwd
;
IBOutlet
NSMenuItem
*
o_mi_bwd
;
IBOutlet
NSMenuItem
*
o_mi_bwd
;
...
@@ -231,6 +232,7 @@
...
@@ -231,6 +232,7 @@
-
(
void
)
updateRecordState
:(
BOOL
)
b_value
;
-
(
void
)
updateRecordState
:(
BOOL
)
b_value
;
-
(
IBAction
)
setPlaybackRate
:(
id
)
sender
;
-
(
IBAction
)
setPlaybackRate
:(
id
)
sender
;
-
(
void
)
updatePlaybackRate
;
-
(
void
)
updatePlaybackRate
;
-
(
IBAction
)
toggleAtoBloop
:(
id
)
sender
;
-
(
IBAction
)
toggleFullscreen
:(
id
)
sender
;
-
(
IBAction
)
toggleFullscreen
:(
id
)
sender
;
-
(
IBAction
)
resizeVideoWindow
:(
id
)
sender
;
-
(
IBAction
)
resizeVideoWindow
:(
id
)
sender
;
...
...
modules/gui/macosx/MainMenu.m
View file @
6ebb7049
...
@@ -320,6 +320,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
...
@@ -320,6 +320,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
[
o_mi_random
setTitle
:
_NS
(
"Random"
)];
[
o_mi_random
setTitle
:
_NS
(
"Random"
)];
[
o_mi_repeat
setTitle
:
_NS
(
"Repeat One"
)];
[
o_mi_repeat
setTitle
:
_NS
(
"Repeat One"
)];
[
o_mi_loop
setTitle
:
_NS
(
"Repeat All"
)];
[
o_mi_loop
setTitle
:
_NS
(
"Repeat All"
)];
[
o_mi_AtoBloop
setTitle
:
_NS
(
"A→B Loop"
)];
[
o_mi_quitAfterPB
setTitle
:
_NS
(
"Quit after Playback"
)];
[
o_mi_quitAfterPB
setTitle
:
_NS
(
"Quit after Playback"
)];
[
o_mi_fwd
setTitle
:
_NS
(
"Step Forward"
)];
[
o_mi_fwd
setTitle
:
_NS
(
"Step Forward"
)];
[
o_mi_bwd
setTitle
:
_NS
(
"Step Backward"
)];
[
o_mi_bwd
setTitle
:
_NS
(
"Step Backward"
)];
...
@@ -693,6 +694,11 @@ static VLCMainMenu *_o_sharedInstance = nil;
...
@@ -693,6 +694,11 @@ static VLCMainMenu *_o_sharedInstance = nil;
[
o_mi_rate_sld
setIntValue
:
i
];
[
o_mi_rate_sld
setIntValue
:
i
];
}
}
-
(
IBAction
)
toggleAtoBloop
:(
id
)
sender
{
[[
VLCCoreInteraction
sharedInstance
]
setAtoB
];
}
#pragma mark -
#pragma mark -
#pragma mark video menu
#pragma mark video menu
...
...
modules/gui/macosx/intf.m
View file @
6ebb7049
...
@@ -1328,6 +1328,7 @@ static VLCMain *_o_sharedMainInstance = nil;
...
@@ -1328,6 +1328,7 @@ static VLCMain *_o_sharedMainInstance = nil;
-
(
void
)
updatePlaybackPosition
-
(
void
)
updatePlaybackPosition
{
{
[
o_mainwindow
updateTimeSlider
];
[
o_mainwindow
updateTimeSlider
];
[[
VLCCoreInteraction
sharedInstance
]
updateAtoB
];
}
}
-
(
void
)
updateVolume
-
(
void
)
updateVolume
...
...
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