Skip to content

V
vlc
Commit b5358a3c authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

* added 2 boxes to the wizard to allow access to sout-transcode-soverlay with... 

* added 2 boxes to the wizard to allow access to sout-transcode-soverlay with the GUI. needs further testing, but can't break anything. Additionally, the wizard's nib got converted to the diff-able xml-like format. refs #1005
parent 8a767673
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 4 deletions
extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib
View file @ b5358a3c
......@@ -91,6 +91,7 @@
"o_t6_btn_mrInfo_ttl" = id;
"o_t6_ckb_local" = id;
"o_t6_ckb_sap" = id;
"o_t6_ckb_soverlay" = id;
"o_t6_fld_sap" = id;
"o_t6_fld_ttl" = id;
"o_t6_text" = id;
......@@ -99,6 +100,7 @@
"o_t7_btn_chooseFile" = id;
"o_t7_btn_mrInfo_local" = id;
"o_t7_ckb_local" = id;
"o_t7_ckb_soverlay" = id;
"o_t7_fld_filePath" = id;
"o_t7_text" = id;
"o_t7_title" = id;
......@@ -111,6 +113,7 @@
"o_t8_fld_partExtract" = id;
"o_t8_fld_sap" = id;
"o_t8_fld_saveFileTo" = id;
"o_t8_fld_soverlay" = id;
"o_t8_fld_strmgMthd" = id;
"o_t8_fld_trnscdAudio" = id;
"o_t8_fld_trnscdVideo" = id;
......@@ -123,6 +126,7 @@
"o_t8_txt_partExtract" = id;
"o_t8_txt_sap" = id;
"o_t8_txt_saveFileTo" = id;
"o_t8_txt_soverlay" = id;
"o_t8_txt_strmgMthd" = id;
"o_t8_txt_text" = id;
"o_t8_txt_title" = id;
......
extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib
View file @ b5358a3c
......@@ -5,7 +5,7 @@
<key>IBDocumentLocation</key>
<string>255 498 356 241 0 0 1024 746 </string>
<key>IBFramework Version</key>
<string>443.0</string>
<string>446.1</string>
<key>IBLockedObjects</key>
<array>
<integer>6</integer>
......@@ -17,6 +17,8 @@
<integer>6</integer>
</array>
<key>IBSystem Version</key>
<string>8H14</string>
<string>8L127</string>
<key>IBUsesTextArchiving</key>
<true/>
</dict>
</plist>
modules/gui/macosx/wizard.h
View file @ b5358a3c
......@@ -102,6 +102,7 @@
IBOutlet id o_t6_btn_mrInfo_ttl;
IBOutlet id o_t6_btn_mrInfo_sap;
IBOutlet id o_t6_btn_mrInfo_local;
IBOutlet id o_t6_ckb_soverlay;
IBOutlet id o_t6_ckb_local;
/* page seven ("Transcode 2") */
......@@ -111,6 +112,7 @@
IBOutlet id o_t7_title;
IBOutlet id o_t7_txt_saveFileTo;
IBOutlet id o_t7_btn_mrInfo_local;
IBOutlet id o_t7_ckb_soverlay;
IBOutlet id o_t7_ckb_local;
/* page eight ("Summary") */
......@@ -123,6 +125,7 @@
IBOutlet id o_t8_fld_strmgMthd;
IBOutlet id o_t8_fld_trnscdAudio;
IBOutlet id o_t8_fld_trnscdVideo;
IBOutlet id o_t8_fld_soverlay;
IBOutlet id o_t8_fld_ttl;
IBOutlet id o_t8_fld_mrl;
IBOutlet id o_t8_fld_local;
......@@ -137,6 +140,7 @@
IBOutlet id o_t8_txt_title;
IBOutlet id o_t8_txt_trnscdAudio;
IBOutlet id o_t8_txt_trnscdVideo;
IBOutlet id o_t8_txt_soverlay;
IBOutlet id o_t8_txt_ttl;
IBOutlet id o_t8_txt_mrl;
IBOutlet id o_t8_txt_local;
......
modules/gui/macosx/wizard.m
View file @ b5358a3c
......@@ -445,6 +445,7 @@ static VLCWizard *_o_sharedInstance = nil;
[o_t6_btn_mrInfo_sap setTitle: _NS("More Info")];
[o_t6_ckb_local setTitle: _NS("Local playback")];
[o_t6_btn_mrInfo_local setTitle: _NS("More Info")];
[o_t6_ckb_soverlay setTitle: _NS("Add Subtitles to transcoded video")];
/* page seven ("Transcode 2") */
[o_t7_title setStringValue: _NS("Additional transcode options")];
......@@ -453,6 +454,11 @@ static VLCWizard *_o_sharedInstance = nil;
[o_t7_txt_saveFileTo setStringValue: _NS("Select the file to save to")];
[o_t7_btn_chooseFile setTitle: _NS("Choose...")];
[o_t7_ckb_local setTitle: _NS("Local playback")];
[o_t7_ckb_soverlay setTitle: _NS("Add Subtitles to transcoded video")];
[o_t7_ckb_soverlay setToolTip: _NS("Adds available subtitles directly to " \
"the video. These cannot be disabled " \
"by the receiving user as they become " \
"part of the image.")];
[o_t7_btn_mrInfo_local setTitle: _NS("More Info")];
/* page eight ("Summary") */
......@@ -477,6 +483,8 @@ static VLCWizard *_o_sharedInstance = nil;
stringByAppendingString: @":"]];
[o_t8_txt_trnscdVideo setStringValue: [_NS("Transcode video") \
stringByAppendingString: @":"]];
[o_t8_txt_soverlay setStringValue: [_NS("Include subtitles") \
stringByAppendingString: @":"]];
[o_t8_txt_local setStringValue: [_NS("Local playback") \
stringByAppendingString: @":"]];
}
......@@ -1144,6 +1152,11 @@ static VLCWizard *_o_sharedInstance = nil;
[o_userSelections setObject:@"NO" forKey:@"localPb"];
}
/* include subtitles? */
[o_userSelections setObject:
[[NSNumber numberWithInt:[o_t6_ckb_soverlay state]] stringValue]
forKey: @"soverlay"];
/* go to "Summary" */
[self showSummary];
}
......@@ -1268,6 +1281,11 @@ static VLCWizard *_o_sharedInstance = nil;
[o_t7_fld_filePath stringValue]] forKey: @"trnscdFilePath"];
}
/* include subtitles ? */
[o_userSelections setObject:
[[NSNumber numberWithInt:[o_t7_ckb_soverlay state]] stringValue]
forKey: @"soverlay"];
/* go to "Summary" */
[self showSummary];
}
......@@ -1408,6 +1426,12 @@ static VLCWizard *_o_sharedInstance = nil;
{
[o_t8_fld_trnscdVideo setStringValue: _NS("no")];
}
if ([[o_userSelections objectForKey:@"soverlay"] isEqualToString:@"1"])
[o_t8_fld_soverlay setStringValue: _NS("yes")];
else
[o_t8_fld_soverlay setStringValue: _NS("no")];
if ([[o_userSelections objectForKey:@"trnscdAudio"] isEqualToString:@"YES"])
{
[o_t8_fld_trnscdAudio setStringValue: [NSString stringWithFormat:
......@@ -1421,7 +1445,6 @@ static VLCWizard *_o_sharedInstance = nil;
[o_t8_fld_trnscdAudio setStringValue: _NS("no")];
}
if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"strmg"])
{
/* we are streaming and perhaps also transcoding */
......@@ -1496,7 +1519,7 @@ static VLCWizard *_o_sharedInstance = nil;
[o_trnscdCmd appendString: @"}:"];
}
}
/* check whether the user requested local playback. if yes, prepare the
* string, if not, let it empty */
if ([[o_userSelections objectForKey:@"localPb"] isEqualToString:@"YES"])
......@@ -1575,6 +1598,10 @@ static VLCWizard *_o_sharedInstance = nil;
{
[o_opts_string appendString: @"\"}"];
}
/* add subtitles to the video if desired */
[o_opts_string appendFormat: @":sout-transcode-soverlay=%@",
[o_userSelections objectForKey:@"soverlay"]];
[tempArray addObject: o_opts_string];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment