* wizard.*: added the display-option to the advanced-transcoding and the advanced...

* THANKS: added zcot's patch ;)

diff --git a/THANKS b/THANKS
index fafd82fad05a1f714b3870718e8fd15cd6de2d2f..e7301b3fe55bedb4bf37631b630c7102ef8e56ec 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -95,7 +95,8 @@ Remco Poortinga <poortinga at telin.nl> - IPv6 multicast patch
 Rene Gollent <rgollent at u.arizona.edu> - BeOS interface fix
 Roine Gustafsson <roine at popstar.com> - spudec bug fixes
 Rudolf Cornelissen <rag.cornelissen at inter.nl.net> - BeOS fixes
-Scott Claude <cutmancw at hotmail dot com> - Visualisation, WX improvements
+Scott Caudle <dorkmanzcot at gmail dot com> - Visualization, WX 
+improvements
 Sebastien Chaumat <Sebastien.Chaumat at ens-lyon.fr> - YOPY port tests
 Steve Lhomme <steve dot lhomme at free dot fr> - MSVC fixes and Matroska enhancements
 Steve Brown <sbrown at cortland.com> - fix for optional PES size bug

diff --git a/extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib
index a080fb3264da88143b957f56cf6ee9f2c7be776d..65add74676db553cc05c27755f870309a48df781 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib
@@ -28,6 +28,7 @@
                 "t4_VidCdcChanged" = id; 
                 "t4_enblAudTrnscd" = id; 
                 "t4_enblVidTrnscd" = id; 
+                "t67_mrInfo_local" = id; 
                 "t6_enblSapAnnce" = id; 
                 "t6_mrInfo_sap" = id; 
                 "t6_mrInfo_ttl" = id; 
@@ -86,8 +87,10 @@
                 "o_t5_matrix_encap" = id; 
                 "o_t5_text" = id; 
                 "o_t5_title" = id; 
+                "o_t6_btn_mrInfo_local" = id; 
                 "o_t6_btn_mrInfo_sap" = id; 
                 "o_t6_btn_mrInfo_ttl" = id; 
+                "o_t6_ckb_local" = id; 
                 "o_t6_ckb_sap" = id; 
                 "o_t6_fld_sap" = id; 
                 "o_t6_fld_ttl" = id; 
@@ -95,6 +98,8 @@
                 "o_t6_title" = id; 
                 "o_t6_txt_ttl" = id; 
                 "o_t7_btn_chooseFile" = id; 
+                "o_t7_btn_mrInfo_local" = id; 
+                "o_t7_ckb_local" = id; 
                 "o_t7_fld_filePath" = id; 
                 "o_t7_text" = id; 
                 "o_t7_title" = id; 
@@ -102,6 +107,7 @@
                 "o_t8_fld_destination" = id; 
                 "o_t8_fld_encapFormat" = id; 
                 "o_t8_fld_inptStream" = id; 
+                "o_t8_fld_local" = id; 
                 "o_t8_fld_mrl" = id; 
                 "o_t8_fld_partExtract" = id; 
                 "o_t8_fld_sap" = id; 
@@ -113,6 +119,7 @@
                 "o_t8_txt_destination" = id; 
                 "o_t8_txt_encapFormat" = id; 
                 "o_t8_txt_inputStream" = id; 
+                "o_t8_txt_local" = id; 
                 "o_t8_txt_mrl" = id; 
                 "o_t8_txt_partExtract" = id; 
                 "o_t8_txt_sap" = id; 

diff --git a/extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib b/extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib
index a363c0aca5b66878709defffaa2fd31ad39fccd7..c25010042a1dda4b0c7141ff6b80d68b5ea192ec 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib
@@ -5,7 +5,7 @@
        <key>IBDocumentLocation</key>
        <string>255 498 356 241 0 0 1024 746 </string>
        <key>IBFramework Version</key>
-       <string>439.0</string>
+       <string>437.0</string>
        <key>IBLockedObjects</key>
        <array>
                <integer>6</integer>

diff --git a/extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib b/extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib
index c4f8bf560c3504a3c3964ba3a390446daff6f34c..38c12e38d297109dcfd98d179e2e414b1b0ddcba 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib and b/extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/wizard.h b/modules/gui/macosx/wizard.h
index 690f63524fedee24975dfb003937186dd8c31a61..3de3c1b349ae7463f8fff1ce6e543655162f11d6 100644 (file)
--- a/modules/gui/macosx/wizard.h
+++ b/modules/gui/macosx/wizard.h
@@ -105,6 +105,8 @@
     IBOutlet id o_t6_txt_ttl;
     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_local;
     
     /* page seven ("Transcode 2") */
     IBOutlet id o_t7_btn_chooseFile;
@@ -112,6 +114,8 @@
     IBOutlet id o_t7_text;
     IBOutlet id o_t7_title;
     IBOutlet id o_t7_txt_saveFileTo;
+    IBOutlet id o_t7_btn_mrInfo_local;
+    IBOutlet id o_t7_ckb_local;
     
     /* page eight ("Summary") */
     IBOutlet id o_t8_fld_destination;
@@ -125,6 +129,7 @@
     IBOutlet id o_t8_fld_trnscdVideo;
     IBOutlet id o_t8_fld_ttl;
     IBOutlet id o_t8_fld_mrl;
+    IBOutlet id o_t8_fld_local;
     IBOutlet id o_t8_txt_destination;
     IBOutlet id o_t8_txt_encapFormat;
     IBOutlet id o_t8_txt_inputStream;
@@ -138,6 +143,7 @@
     IBOutlet id o_t8_txt_trnscdVideo;
     IBOutlet id o_t8_txt_ttl;
     IBOutlet id o_t8_txt_mrl;
+    IBOutlet id o_t8_txt_local;
     
     NSMutableDictionary * o_userSelections;
     NSArray * o_videoCodecs;
@@ -162,6 +168,7 @@
 - (IBAction)t6_enblSapAnnce:(id)sender;
 - (IBAction)t6_mrInfo_ttl:(id)sender;
 - (IBAction)t6_mrInfo_sap:(id)sender;
+- (IBAction)t67_mrInfo_local:(id)sender;
 - (IBAction)t7_selectTrnscdDestFile:(id)sender;
 - (IBAction)wh_closeSheet:(id)sender;
 

diff --git a/modules/gui/macosx/wizard.m b/modules/gui/macosx/wizard.m
index 612be9228c52b6ecca6a1103350de1993a90e3a3..6e6b9bfad619a03e936a01b893c89320c7f0a89e 100644 (file)
--- a/modules/gui/macosx/wizard.m
+++ b/modules/gui/macosx/wizard.m
@@ -372,9 +372,9 @@ static VLCWizard *_o_sharedInstance = nil;
         setStringValue: _NS("Author")];
     [o_t2_box_prtExtrct setTitle: _NS("Partial Extract")];
     [o_t2_ckb_enblPartExtrct setTitle: _NS("Enable")];
-    [o_t2_ckb_enblPartExtrct setToolTip: _NS("Use this to read only a part of " \
+    [o_t2_ckb_enblPartExtrct setToolTip: _NS("Use this to read only a part of "\
         "the stream. You must be able to control the incoming stream " \
-        "(for example, a file or a disc, but not an UDP network stream.)\n" \
+        "(for example, a file or a disc, but not an UDP network stream.) " \
         "Enter the starting and ending times (in seconds).")];
     [o_t2_txt_prtExtrctFrom setStringValue: _NS("From")];
     [o_t2_txt_prtExtrctTo setStringValue: _NS("To")];
@@ -426,7 +426,7 @@ static VLCWizard *_o_sharedInstance = nil;
     /* page seven ("Transcode 2") */
     [o_t7_title setStringValue: _NS("Additional transcode options")];
     [o_t7_text setStringValue: _NS("In this page, you will define a few " \
-                              "additionnal parameters for your transcoding.")];
+                              "additional parameters for your transcoding.")];
     [o_t7_txt_saveFileTo setStringValue: _NS("Select the file to save to")];
     [o_t7_btn_chooseFile setTitle: _NS("Choose...")];
 
@@ -452,6 +452,8 @@ static VLCWizard *_o_sharedInstance = nil;
         stringByAppendingString: @":"]];
     [o_t8_txt_trnscdVideo setStringValue: [_NS("Transcode video") \
         stringByAppendingString: @":"]];
+    [o_t8_txt_local setStringValue: [_NS("Local playback") \
+        stringByAppendingString: @":"]];
 
     /* wizard help window */
     [o_wh_btn_okay setTitle: _NS("OK")];
@@ -1080,13 +1082,29 @@ static VLCWizard *_o_sharedInstance = nil;
         } else {
             [o_userSelections setObject:@"NO" forKey:@"sap"];
         }
-
+        
+        /* local playback? */
+        if ([o_t6_ckb_local state] == NSOnState)
+        {
+            [o_userSelections setObject:@"YES" forKey:@"localPb"];
+        } else {
+            [o_userSelections setObject:@"NO" forKey:@"localPb"];
+        }
+        
         /* go to "Summary" */
         [self showSummary];
     }
     else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: \
         @"Transcode 2"])
     {
+        /* local playback? */
+        if ([o_t7_ckb_local state] == NSOnState)
+        {
+            [o_userSelections setObject:@"YES" forKey:@"localPb"];
+        } else {
+            [o_userSelections setObject:@"NO" forKey:@"localPb"];
+        }
+
         /* check whether the path != "" and store it */
         if( [[o_t7_fld_filePath stringValue] isEqualToString: @""] )
         {
@@ -1173,6 +1191,13 @@ static VLCWizard *_o_sharedInstance = nil;
 {
     [o_btn_forward setTitle: _NS("Finish")];
     [o_t8_fld_inptStream setStringValue:[o_userSelections objectForKey:@"pathToStrm"]];
+    
+    if ([[o_userSelections objectForKey:@"localPb"] isEqualToString: @"YES"])
+    {
+        [o_t8_fld_local setStringValue: _NS("yes")];
+    } else {
+        [o_t8_fld_local setStringValue: _NS("no")];
+    }
 
     if ([[o_userSelections objectForKey:@"partExtract"] isEqualToString: @"YES"])
     {
@@ -1250,6 +1275,7 @@ static VLCWizard *_o_sharedInstance = nil;
 {
     NSMutableString * o_opts_string = [NSMutableString stringWithString:@""];
     NSMutableString *o_trnscdCmd = [NSMutableString stringWithString:@""];
+    NSMutableString *o_duplicateCmd = [NSMutableString stringWithString:@""];
     
     /* check whether we transcode the audio and/or the video and compose a
      * string reflecting the settings, if needed */
@@ -1269,6 +1295,14 @@ 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"])
+    {
+        [o_duplicateCmd appendString: @"duplicate{dst=display,dst=\""];
+    }
+    
     if ([[o_userSelections objectForKey:@"trnscdAudio"] isEqualToString:@"YES"])
     {
         if ([[o_userSelections objectForKey:@"trnscdVideo"] isEqualToString:@"NO"])
@@ -1285,11 +1319,12 @@ static VLCWizard *_o_sharedInstance = nil;
     if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"trnscd"])
     {
         /* we are just transcoding and dumping the stuff to a file */
-        [o_opts_string appendFormat: @":sout=#%sstandard{mux=%s,url=%s,access=file}", \
-            [o_trnscdCmd UTF8String], [[[o_encapFormats objectAtIndex: \
-            [[o_userSelections objectForKey:@"encapFormat"] intValue]] \
-            objectAtIndex:0] UTF8String], [[o_userSelections objectForKey: \
-            @"trnscdFilePath"] UTF8String]];
+        [o_opts_string appendFormat: \
+            @":sout=#%s%sstandard{mux=%s,url=%s,access=file}", [o_duplicateCmd \
+            UTF8String], [o_trnscdCmd UTF8String], [[[o_encapFormats \
+            objectAtIndex: [[o_userSelections objectForKey:@"encapFormat"] \
+            intValue]] objectAtIndex:0] UTF8String], [[o_userSelections \
+            objectForKey: @"trnscdFilePath"] UTF8String]];
 
     } else {
 
@@ -1305,25 +1340,36 @@ static VLCWizard *_o_sharedInstance = nil;
                 [o_sap_option appendFormat: @"sap,name=\"%s\"",[[o_userSelections \
                     objectForKey:@"sapText"] UTF8String]];
             }
-            [o_opts_string appendFormat: @":sout=#%sstandard{mux=%s,url=%s,access=%s,%s}", \
-                [o_trnscdCmd UTF8String], [[[o_encapFormats objectAtIndex: \
-                [[o_userSelections objectForKey: @"encapFormat"] intValue]] \
-                objectAtIndex:0] UTF8String], [[o_userSelections objectForKey: \
-                @"stmgDest"] UTF8String], [[[o_strmgMthds objectAtIndex: \
-                [[o_userSelections objectForKey: @"stmgMhd"] intValue]] \
-                objectAtIndex:0] UTF8String], [o_sap_option UTF8String]];
+            [o_opts_string appendFormat: \
+                @":sout=#%s%sstandard{mux=%s,url=%s,access=%s,%s}", \
+                [o_duplicateCmd UTF8String], [o_trnscdCmd UTF8String], \
+                [[[o_encapFormats objectAtIndex: [[o_userSelections \
+                objectForKey: @"encapFormat"] intValue]] objectAtIndex:0] \
+                UTF8String], [[o_userSelections objectForKey: @"stmgDest"] \
+                UTF8String], [[[o_strmgMthds objectAtIndex: [[o_userSelections \
+                objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0] \
+                UTF8String], [o_sap_option UTF8String]];
         } else {
             /* no SAP, just streaming */
-            [o_opts_string appendFormat: @":sout=#%sstandard{mux=%s,url=%s,access=%s}", \
-                [o_trnscdCmd UTF8String], [[[o_encapFormats objectAtIndex: \
-                [[o_userSelections objectForKey: @"encapFormat"] intValue]] \
-                objectAtIndex:0] UTF8String], [[o_userSelections objectForKey: \
+            [o_opts_string appendFormat: \
+                @":sout=#%s%sstandard{mux=%s,url=%s,access=%s}", \
+                [o_duplicateCmd UTF8String], [o_trnscdCmd UTF8String], \
+                [[[o_encapFormats objectAtIndex: [[o_userSelections \
+                objectForKey: @"encapFormat"] intValue]] objectAtIndex:0] \
+                UTF8String], [[o_userSelections objectForKey: \
                 @"stmgDest"] UTF8String], [[[o_strmgMthds objectAtIndex: \
                 [[o_userSelections objectForKey: @"stmgMhd"] intValue]] \
                 objectAtIndex:0] UTF8String]];
         }
     }
 
+    /* check whether the user requested local playback. if yes, close the
+     * string with an additional bracket */
+    if ([[o_userSelections objectForKey:@"localPb"] isEqualToString:@"YES"])
+    {
+        [o_opts_string appendString: @"\"}"];
+    }
+
     [o_userSelections setObject:o_opts_string forKey:@"opts"];
 }
 
@@ -1605,6 +1651,16 @@ static VLCWizard *_o_sharedInstance = nil;
             contextInfo: nil];
 }
 
+- (IBAction)t67_mrInfo_local:(id)sender
+{
+    /* show a sheet for the help */
+    NSBeginInformationalAlertSheet(_NS("Local playback"), \
+            _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \
+            _NS("When this option is enabled, the stream will be both played " \
+            "and transcoded/streamed.\n\nNote that this requires much more " \
+            "CPU power than simple transcoding or streaming."));
+}
+
 - (IBAction)t7_selectTrnscdDestFile:(id)sender
 {
     /* provide a save-to-dialogue, so the user can choose a location for his/her new file */