Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
6c5188c7
Commit
6c5188c7
authored
Sep 09, 2003
by
hartman
Browse files
Fixed list of muxers. QT and mp4 might need to be disabled at a later point.
parent
5935dc9c
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/gui/macosx/open.m
View file @
6c5188c7
...
...
@@ -2,7 +2,7 @@
* open.m: MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: open.m,v 1.3
6
2003/0
7/27 23:05
:4
1
hartman Exp $
* $Id: open.m,v 1.3
7
2003/0
9/09 13:51
:4
5
hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
...
...
@@ -231,8 +231,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
if
(
i_result
)
{
intf_thread_t
*
p_intf
=
[
NSApp
getIntf
];
NSMutableDictionary
*
o_dic
;
NSMutableArray
*
o_options
=
[
NSMutableArray
array
];
BOOL
b_enq
=
[
o_ckbox_enqueue
state
]
==
NSOnState
?
YES
:
NO
;
...
...
modules/gui/macosx/output.m
View file @
6c5188c7
...
...
@@ -2,7 +2,7 @@
* output.m: MacOS X Output Dialog
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: output.m,v 1.1
2
2003/0
7/28 21:41:20 massiot
Exp $
* $Id: output.m,v 1.1
3
2003/0
9/09 13:51:45 hartman
Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
...
...
@@ -112,6 +112,8 @@
-
(
void
)
initStrings
{
NSArray
*
o_muxers
=
[
NSArray
arrayWithObjects
:
@"MPEG TS"
,
@"MPEG PS"
,
@"MPEG1"
,
@"AVI"
,
@"Ogg"
,
@"MPEG4"
,
@"Quicktime"
,
nil
];
NSArray
*
o_a_channels
=
[
NSArray
arrayWithObjects
:
@"1"
,
@"2"
,
@"4"
,
@"6"
,
nil
];
NSArray
*
o_a_bitrates
=
[
NSArray
arrayWithObjects
:
@"96"
,
@"128"
,
@"192"
,
@"256"
,
@"512"
,
nil
];
NSArray
*
o_v_bitrates
=
[
NSArray
arrayWithObjects
:
...
...
@@ -119,7 +121,7 @@
NSArray
*
o_a_codecs
=
[
NSArray
arrayWithObjects
:
@"mpga"
,
@"mp3 "
,
@"a52 "
,
@"vorb"
,
nil
];
NSArray
*
o_v_codecs
=
[
NSArray
arrayWithObjects
:
@"mp
g
v"
,
@"mp4v"
,
@"DIV1"
,
@"DIV2"
,
@"DIV3"
,
@"H263"
,
@"I263"
,
@"WMV1"
,
@"WMV2"
,
@"MJPG"
,
nil
];
@"mp
1v"
,
@"mp2
v"
,
@"mp4v"
,
@"DIV1"
,
@"DIV2"
,
@"DIV3"
,
@"H263"
,
@"I263"
,
@"WMV1"
,
@"WMV2"
,
@"MJPG"
,
nil
];
[
o_output_ckbox
setTitle
:
_NS
(
"Advanced output:"
)];
[
o_output_settings
setTitle
:
_NS
(
"Settings..."
)];
...
...
@@ -139,12 +141,8 @@
[
o_stream_type_lbl
setStringValue
:
_NS
(
"Type"
)];
[
o_mux_lbl
setStringValue
:
_NS
(
"Encapsulation Method"
)];
[[
o_mux_selector
itemAtIndex
:
0
]
setTitle
:
_NS
(
"MPEG TS"
)];
[[
o_mux_selector
itemAtIndex
:
1
]
setTitle
:
_NS
(
"MPEG PS"
)];
[[
o_mux_selector
itemAtIndex
:
1
]
setTitle
:
_NS
(
"MPEG1"
)];
[[
o_mux_selector
itemAtIndex
:
3
]
setTitle
:
_NS
(
"AVI"
)];
[[
o_mux_selector
itemAtIndex
:
4
]
setTitle
:
_NS
(
"Ogg"
)];
//[[o_mux_selector itemAtIndex: 5] setTitle: _NS("mp4")];
[
o_mux_selector
removeAllItems
];
[
o_mux_selector
addItemsWithTitles
:
o_muxers
];
[
o_transcode_lbl
setTitle
:
_NS
(
"Transcode options"
)];
[
o_transcode_video_chkbox
setTitle
:
_NS
(
"Video"
)];
...
...
@@ -220,7 +218,8 @@
[[
o_mux_selector
itemAtIndex
:
2
]
setEnabled
:
YES
];
[[
o_mux_selector
itemAtIndex
:
3
]
setEnabled
:
YES
];
[[
o_mux_selector
itemAtIndex
:
4
]
setEnabled
:
YES
];
//[[o_mux_selector itemAtIndex: 5] setEnabled: YES];
[[
o_mux_selector
itemAtIndex
:
5
]
setEnabled
:
YES
];
[[
o_mux_selector
itemAtIndex
:
6
]
setEnabled
:
YES
];
}
else
if
(
[
o_mode
isEqualToString
:
_NS
(
"Stream"
)]
)
{
...
...
@@ -242,7 +241,8 @@
[[
o_mux_selector
itemAtIndex
:
2
]
setEnabled
:
YES
];
[[
o_mux_selector
itemAtIndex
:
3
]
setEnabled
:
NO
];
[[
o_mux_selector
itemAtIndex
:
4
]
setEnabled
:
YES
];
//[[o_mux_selector itemAtIndex: 5] setEnabled: NO];
[[
o_mux_selector
itemAtIndex
:
5
]
setEnabled
:
NO
];
[[
o_mux_selector
itemAtIndex
:
6
]
setEnabled
:
NO
];
}
else
if
(
[
o_mode
isEqualToString
:
_NS
(
"UDP"
)]
)
{
...
...
@@ -253,7 +253,8 @@
[[
o_mux_selector
itemAtIndex
:
2
]
setEnabled
:
NO
];
[[
o_mux_selector
itemAtIndex
:
3
]
setEnabled
:
NO
];
[[
o_mux_selector
itemAtIndex
:
4
]
setEnabled
:
NO
];
//[[o_mux_selector itemAtIndex: 5] setEnabled: NO];
[[
o_mux_selector
itemAtIndex
:
5
]
setEnabled
:
NO
];
[[
o_mux_selector
itemAtIndex
:
6
]
setEnabled
:
NO
];
[
o_sap_chkbox
setEnabled
:
YES
];
[
o_sap_name
setEnabled
:
YES
];
}
...
...
@@ -266,7 +267,8 @@
[[
o_mux_selector
itemAtIndex
:
2
]
setEnabled
:
NO
];
[[
o_mux_selector
itemAtIndex
:
3
]
setEnabled
:
NO
];
[[
o_mux_selector
itemAtIndex
:
4
]
setEnabled
:
NO
];
//[[o_mux_selector itemAtIndex: 5] setEnabled: NO];
[[
o_mux_selector
itemAtIndex
:
5
]
setEnabled
:
NO
];
[[
o_mux_selector
itemAtIndex
:
6
]
setEnabled
:
NO
];
}
}
if
(
!
[[
o_mux_selector
selectedItem
]
isEnabled
]
)
...
...
@@ -293,8 +295,9 @@
if
(
[
o_mux
isEqualToString
:
_NS
(
"AVI"
)]
)
o_mux_string
=
@"avi"
;
else
if
(
[
o_mux
isEqualToString
:
_NS
(
"Ogg"
)]
)
o_mux_string
=
@"ogg"
;
else
if
(
[
o_mux
isEqualToString
:
_NS
(
"MPEG PS"
)]
)
o_mux_string
=
@"ps"
;
else
if
(
[
o_mux
isEqualToString
:
_NS
(
"
mp
4"
)]
)
o_mux_string
=
@"mp4"
;
else
if
(
[
o_mux
isEqualToString
:
_NS
(
"
MPEG
4"
)]
)
o_mux_string
=
@"mp4"
;
else
if
(
[
o_mux
isEqualToString
:
_NS
(
"MPEG1"
)]
)
o_mux_string
=
@"mpeg1"
;
else
if
(
[
o_mux
isEqualToString
:
_NS
(
"Quicktime"
)]
)
o_mux_string
=
@"mov"
;
else
o_mux_string
=
@"ts"
;
if
(
[
o_mode
isEqualToString
:
_NS
(
"File"
)]
)
...
...
@@ -353,8 +356,10 @@
o_mux_string
=
@"avi"
;
else
if
(
[[
o_mux_selector
titleOfSelectedItem
]
isEqualToString
:
_NS
(
"Ogg"
)]
)
o_mux_string
=
@"ogm"
;
else
if
(
[[
o_mux_selector
titleOfSelectedItem
]
isEqualToString
:
_NS
(
"
mp
4"
)]
)
else
if
(
[[
o_mux_selector
titleOfSelectedItem
]
isEqualToString
:
_NS
(
"
MPEG
4"
)]
)
o_mux_string
=
@"mp4"
;
else
if
(
[[
o_mux_selector
titleOfSelectedItem
]
isEqualToString
:
_NS
(
"Quicktime"
)]
)
o_mux_string
=
@"mov"
;
else
o_mux_string
=
@"ts"
;
...
...
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