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
a5be2f81
Commit
a5be2f81
authored
Aug 24, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx/output: simplify header and implementation
parent
b0df43f9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
17 deletions
+6
-17
modules/gui/macosx/open.m
modules/gui/macosx/open.m
+2
-2
modules/gui/macosx/output.h
modules/gui/macosx/output.h
+1
-2
modules/gui/macosx/output.m
modules/gui/macosx/output.m
+3
-13
No files found.
modules/gui/macosx/open.m
View file @
a5be2f81
...
...
@@ -482,10 +482,10 @@ static VLCOpen *_o_sharedMainInstance = nil;
[
o_options
addObject
:
[
NSString
stringWithFormat
:
@"stop-time=%li"
,
tempValue
]];
if
(
[
o_output_ckbox
state
]
==
NSOnState
)
{
NSUInteger
count
=
[[
o_sout_options
mrl
]
count
];
NSUInteger
count
=
[[
o_sout_options
soutMRL
]
count
];
for
(
NSUInteger
i
=
0
;
i
<
count
;
i
++
)
{
[
o_options
addObject
:
[
NSString
stringWithString
:
[[(
VLCOutput
*
)
o_sout_options
mrl
]
objectAtIndex
:
i
]]];
[
o_options
addObject
:
[
NSString
stringWithString
:
[[(
VLCOutput
*
)
o_sout_options
soutMRL
]
objectAtIndex
:
i
]]];
}
}
if
(
[
o_file_slave_ckbox
state
]
&&
o_file_slave_path
)
...
...
modules/gui/macosx/output.h
View file @
a5be2f81
...
...
@@ -82,9 +82,8 @@
NSArray
*
o_mrl
;
NSString
*
o_transcode
;
}
@property
(
readwrite
,
assign
)
NSArray
*
soutMRL
;
-
(
void
)
setMRL
:(
NSArray
*
)
o_mrl_string
;
-
(
NSArray
*
)
mrl
;
-
(
void
)
setTranscode
:(
NSString
*
)
o_transcode_string
;
-
(
void
)
initStrings
;
...
...
modules/gui/macosx/output.m
View file @
a5be2f81
...
...
@@ -37,6 +37,7 @@
* VLCOutput implementation
*****************************************************************************/
@implementation
VLCOutput
@synthesize
soutMRL
=
o_mrl
;
-
(
id
)
init
{
...
...
@@ -53,17 +54,6 @@
[
super
dealloc
];
}
-
(
void
)
setMRL
:(
NSArray
*
)
o_mrl_array
{
[
o_mrl
autorelease
];
o_mrl
=
[
o_mrl_array
copy
];
}
-
(
NSArray
*
)
mrl
{
return
[
o_mrl
copy
];
}
-
(
void
)
setTranscode
:(
NSString
*
)
o_transcode_string
{
[
o_transcode
autorelease
];
...
...
@@ -377,7 +367,7 @@
@":demuxdump-file=%@"
,
[
o_file_field
stringValue
]],
nil
];
[
self
setMRL
:
o_sout_options
];
[
self
set
Sout
MRL
:
o_sout_options
];
return
;
}
else
...
...
@@ -480,7 +470,7 @@
[
o_mrl_string
appendString
:
@"}"
];
}
o_sout_options
=
[
NSArray
arrayWithObjects
:
o_mrl_string
,
nil
];
[
self
setMRL
:
o_sout_options
];
[
self
set
Sout
MRL
:
o_sout_options
];
}
-
(
void
)
TTLChanged
:(
NSNotification
*
)
o_notification
...
...
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