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
f35c3d11
Commit
f35c3d11
authored
Mar 20, 2015
by
Aleksandr Pasechnik
Committed by
Felix Paul Kühne
Mar 23, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
enable the macosx GUI to handle negative stop-time
Signed-off-by:
Felix Paul Kühne
<
fkuehne@videolan.org
>
parent
1d8905ec
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
modules/gui/macosx/misc.m
modules/gui/macosx/misc.m
+1
-1
modules/gui/macosx/open.m
modules/gui/macosx/open.m
+1
-1
modules/gui/macosx/playlist.m
modules/gui/macosx/playlist.m
+1
-1
modules/gui/macosx/wizard.m
modules/gui/macosx/wizard.m
+1
-1
No files found.
modules/gui/macosx/misc.m
View file @
f35c3d11
...
@@ -867,7 +867,7 @@ void _drawFrameInRect(NSRect frameRect)
...
@@ -867,7 +867,7 @@ void _drawFrameInRect(NSRect frameRect)
{
{
self
=
[
super
init
];
self
=
[
super
init
];
NSMutableCharacterSet
*
nonNumbers
=
[[[
NSCharacterSet
decimalDigitCharacterSet
]
invertedSet
]
mutableCopy
];
NSMutableCharacterSet
*
nonNumbers
=
[[[
NSCharacterSet
decimalDigitCharacterSet
]
invertedSet
]
mutableCopy
];
[
nonNumbers
removeCharactersInString
:
@":"
];
[
nonNumbers
removeCharactersInString
:
@"
-
:"
];
o_forbidden_characters
=
[
nonNumbers
copy
];
o_forbidden_characters
=
[
nonNumbers
copy
];
[
nonNumbers
release
];
[
nonNumbers
release
];
...
...
modules/gui/macosx/open.m
View file @
f35c3d11
...
@@ -475,7 +475,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
...
@@ -475,7 +475,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
tempValue
=
[[
components
objectAtIndex
:
0
]
intValue
]
*
60
+
[[
components
objectAtIndex
:
1
]
intValue
];
tempValue
=
[[
components
objectAtIndex
:
0
]
intValue
]
*
60
+
[[
components
objectAtIndex
:
1
]
intValue
];
else
if
(
componentCount
==
3
)
else
if
(
componentCount
==
3
)
tempValue
=
[[
components
objectAtIndex
:
0
]
intValue
]
*
3600
+
[[
components
objectAtIndex
:
1
]
intValue
]
*
60
+
[[
components
objectAtIndex
:
2
]
intValue
];
tempValue
=
[[
components
objectAtIndex
:
0
]
intValue
]
*
3600
+
[[
components
objectAtIndex
:
1
]
intValue
]
*
60
+
[[
components
objectAtIndex
:
2
]
intValue
];
if
(
tempValue
>
0
)
if
(
tempValue
!=
0
)
[
o_options
addObject
:
[
NSString
stringWithFormat
:
@"stop-time=%li"
,
tempValue
]];
[
o_options
addObject
:
[
NSString
stringWithFormat
:
@"stop-time=%li"
,
tempValue
]];
}
}
if
([
o_output_ckbox
state
]
==
NSOnState
)
{
if
([
o_output_ckbox
state
]
==
NSOnState
)
{
...
...
modules/gui/macosx/playlist.m
View file @
f35c3d11
...
@@ -973,7 +973,7 @@
...
@@ -973,7 +973,7 @@
/* allow the user to over-write the start/stop/run-time */
/* allow the user to over-write the start/stop/run-time */
if
(
var_GetFloat
(
p_input_thread
,
"run-time"
)
>
0
||
if
(
var_GetFloat
(
p_input_thread
,
"run-time"
)
>
0
||
var_GetFloat
(
p_input_thread
,
"start-time"
)
>
0
||
var_GetFloat
(
p_input_thread
,
"start-time"
)
>
0
||
var_GetFloat
(
p_input_thread
,
"stop-time"
)
>
0
)
{
var_GetFloat
(
p_input_thread
,
"stop-time"
)
!=
0
)
{
return
;
return
;
}
}
...
...
modules/gui/macosx/wizard.m
View file @
f35c3d11
...
@@ -1232,7 +1232,7 @@ static VLCWizard *_o_sharedInstance = nil;
...
@@ -1232,7 +1232,7 @@ static VLCWizard *_o_sharedInstance = nil;
time
=
1000000
*
([[
components
objectAtIndex
:
0
]
intValue
]
*
3600
+
[[
components
objectAtIndex
:
1
]
intValue
]
*
60
+
[[
components
objectAtIndex
:
2
]
intValue
]);
time
=
1000000
*
([[
components
objectAtIndex
:
0
]
intValue
]
*
3600
+
[[
components
objectAtIndex
:
1
]
intValue
]
*
60
+
[[
components
objectAtIndex
:
2
]
intValue
]);
else
else
msg_Err
(
VLCIntf
,
"Invalid string format for time"
);
msg_Err
(
VLCIntf
,
"Invalid string format for time"
);
input_item_AddOption
(
p_input
,
[[
NSString
stringWithFormat
:
@"stop-time=%l
u
"
,
time
]
UTF8String
],
VLC_INPUT_OPTION_TRUSTED
);
input_item_AddOption
(
p_input
,
[[
NSString
stringWithFormat
:
@"stop-time=%l
d
"
,
time
]
UTF8String
],
VLC_INPUT_OPTION_TRUSTED
);
}
}
input_item_AddOption
(
p_input
,
[[
NSString
stringWithFormat
:
input_item_AddOption
(
p_input
,
[[
NSString
stringWithFormat
:
...
...
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