sout-standard-url is deprecated

include/vlc_osd.h

@@ -39,7 +39,7 @@
  * if used inside a transcoding command. For example:
  *
  *  vlc dvdsimple:///dev/dvd --extraintf rc
- *  --sout='#transcode{osd}:std{access=udp,mux=ts,url=dest_ipaddr}'
+ *  --sout='#transcode{osd}:std{access=udp,mux=ts,dst=dest_ipaddr}'
  *  --osdmenu-file=share/osdmenu/dvd.cfg
  *
  * Each OSD menu element, called "action", defines a hotkey action. Each action

modules/access_output/shout.c

@@ -33,7 +33,7 @@
  *
  * vlc v4l:/dev/video:input=2:norm=pal:size=192x144 \
  * --sout '#transcode{vcodec=theora,vb=300,acodec=vorb,ab=96}\
- * :std{access=shout,mux=ogg,url=localhost:8005}'
+ * :std{access=shout,mux=ogg,dst=localhost:8005}'
  *
  *****************************************************************************/
 

modules/gui/macosx/output.m

@@ -384,7 +384,7 @@
         else
         {
                 [o_mrl_string appendFormat:
-                        @"std{access=file,mux=%@,url=\"%@\"}",
+                        @"std{access=file,mux=%@,dst=\"%@\"}",
                         o_mux_string, [o_file_field stringValue]];
         }
     }
@@ -442,7 +442,7 @@
             }
             
             [o_mrl_string appendFormat:
-                        @"std{access=%@,mux=%@,url=%@%@}",
+                        @"std{access=%@,mux=%@,dst=%@%@}",
                         o_mode, o_mux_string, o_finalStreamAddress, o_announce];
         }
         else

modules/gui/macosx/wizard.m

@@ -1341,7 +1341,7 @@ static VLCWizard *_o_sharedInstance = nil;
     {
         /* we are just transcoding and dumping the stuff to a file */
         [o_opts_string appendFormat: \
-            @":sout=#%s%sstandard{mux=%s,url=%s,access=file}", [o_duplicateCmd \
+            @":sout=#%s%sstandard{mux=%s,dst=%s,access=file}", [o_duplicateCmd \
             UTF8String], [o_trnscdCmd UTF8String], [[[o_encapFormats \
             objectAtIndex: [[o_userSelections objectForKey:@"encapFormat"] \
             intValue]] objectAtIndex:0] UTF8String], [[o_userSelections \
@@ -1362,7 +1362,7 @@ static VLCWizard *_o_sharedInstance = nil;
                     objectForKey:@"sapText"] UTF8String]];
             }
             [o_opts_string appendFormat: \
-                @":sout=#%s%sstandard{mux=%s,url=%s,access=%s,%s}", \
+                @":sout=#%s%sstandard{mux=%s,dst=%s,access=%s,%s}", \
                 [o_duplicateCmd UTF8String], [o_trnscdCmd UTF8String], \
                 [[[o_encapFormats objectAtIndex: [[o_userSelections \
                 objectForKey: @"encapFormat"] intValue]] objectAtIndex:0] \
@@ -1373,7 +1373,7 @@ static VLCWizard *_o_sharedInstance = nil;
         } else {
             /* no SAP, just streaming */
             [o_opts_string appendFormat: \
-                @":sout=#%s%sstandard{mux=%s,url=%s,access=%s}", \
+                @":sout=#%s%sstandard{mux=%s,dst=%s,access=%s}", \
                 [o_duplicateCmd UTF8String], [o_trnscdCmd UTF8String], \
                 [[[o_encapFormats objectAtIndex: [[o_userSelections \
                 objectForKey: @"encapFormat"] intValue]] objectAtIndex:0] \

modules/gui/pda/pda_callbacks.c

@@ -1114,7 +1114,7 @@ void onAddTranscodeToPlaylist(GtkButton *button, gpointer user_data)
     if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0';
     i_pos += snprintf( &ppsz_options[i_options][i_pos], VLC_MAX_MRL - i_pos, "mux=%s,", (char*)p_std_muxer);
     if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0';
-    i_pos += snprintf( &ppsz_options[i_options][i_pos], VLC_MAX_MRL - i_pos, "url=%s", (char*)p_std_url);
+    i_pos += snprintf( &ppsz_options[i_options][i_pos], VLC_MAX_MRL - i_pos, "dst=%s", (char*)p_std_url);
     if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0';
 
     if (strncasecmp( (const char*)p_std_access, "udp", 3)==0)

modules/gui/wxwidgets/dialogs/streamout.cpp

@@ -330,14 +330,14 @@ void SoutDialog::UpdateMRL()
     {
         if( !dup_opts.IsEmpty() ) dup_opts += wxT(",");
         dup_opts += wxT("dst=std{access=file,mux=");
-        dup_opts += encapsulation + wxT(",url=\"");
+        dup_opts += encapsulation + wxT(",dst=\"");
         dup_opts += file_combo->GetValue() + wxT("\"}");
     }
     if( access_checkboxes[HTTP_ACCESS_OUT]->IsChecked() )
     {
         if( !dup_opts.IsEmpty() ) dup_opts += wxT(",");
         dup_opts += wxT("dst=std{access=http,mux=");
-        dup_opts += encapsulation + wxT(",url=");
+        dup_opts += encapsulation + wxT(",dst=");
         dup_opts += net_addrs[HTTP_ACCESS_OUT]->GetLineText(0);
         dup_opts += wxString::Format( wxT(":%d"),
                                       net_ports[HTTP_ACCESS_OUT]->GetValue() );
@@ -349,7 +349,7 @@ void SoutDialog::UpdateMRL()
         dup_opts += wxT("dst=std{access=mmsh,mux=");
         dup_opts += encapsulation;
         if( i_encapsulation_type == ASF_ENCAPSULATION ) dup_opts += wxT("h");
-        dup_opts += wxT(",url=");
+        dup_opts += wxT(",dst=");
         dup_opts += net_addrs[MMSH_ACCESS_OUT]->GetLineText(0);
         dup_opts += wxString::Format( wxT(":%d"),
                                       net_ports[MMSH_ACCESS_OUT]->GetValue() );
@@ -359,7 +359,7 @@ void SoutDialog::UpdateMRL()
     {
         if( !dup_opts.IsEmpty() ) dup_opts += wxT(",");
         dup_opts += wxT("dst=std{access=rtp,mux=");
-        dup_opts += encapsulation + wxT(",url=");
+        dup_opts += encapsulation + wxT(",dst=");
 
         wxString rtp_addr = net_addrs[RTP_ACCESS_OUT]->GetLineText(0);
         if ((rtp_addr[0u] != '[') && (rtp_addr.Find(':') != -1))
@@ -398,7 +398,7 @@ void SoutDialog::UpdateMRL()
     {
         if( !dup_opts.IsEmpty() ) dup_opts += wxT(",");
         dup_opts += wxT("dst=std{access=udp,mux=");
-        dup_opts += encapsulation + wxT(",url=");
+        dup_opts += encapsulation + wxT(",dst=");
 
         wxString udp_addr = net_addrs[UDP_ACCESS_OUT]->GetLineText(0);
         if ((udp_addr[0u] != '[') && (udp_addr.Find(':') != -1))

modules/gui/wxwidgets/dialogs/wizard.cpp

@@ -1587,7 +1587,7 @@ void WizardDialog::Run()
             else
                 psz_transcode = "";
 
-            asprintf( &psz_opt, ":sout=#%sstandard{mux=%s,url=%s,"
+            asprintf( &psz_opt, ":sout=#%sstandard{mux=%s,dst=%s,"
                       "access=file}", psz_transcode, mux, address );
 
             if( *psz_transcode )
@@ -1615,7 +1615,7 @@ void WizardDialog::Run()
             /* Add brackets automatically for IPv6 if they are missing */
             v6 = ( address[0] != '[' ) && ( strchr( address, ':' ) != NULL );
             asprintf( &psz_opt,
-                      ":sout=#standard{mux=%s,url=%s%s%s,access=%s%s}",
+                      ":sout=#standard{mux=%s,dst=%s%s%s,access=%s%s}",
                       mux, v6 ? "[" : "", address, v6 ? "]" : "", method,
                       psz_sap_option ?: "" );
             if( psz_sap_option ) free( psz_sap_option );

src/stream_output/stream_output.c

@@ -1180,12 +1180,12 @@ static char *_sout_stream_url_to_chain( vlc_object_t *p_this, char *psz_url )
     if( config_GetInt( p_this, "sout-display" ) )
     {
         p += sprintf( p, "duplicate{dst=display,dst=std{mux=\"%s\","
-                      "access=\"%s\",url=\"%s\"}}",
+                      "access=\"%s\",dst=\"%s\"}}",
                       mrl.psz_way, mrl.psz_access, mrl.psz_name );
     }
     else
     {
-        p += sprintf( p, "std{mux=\"%s\",access=\"%s\",url=\"%s\"}",
+        p += sprintf( p, "std{mux=\"%s\",access=\"%s\",dst=\"%s\"}",
                       mrl.psz_way, mrl.psz_access, mrl.psz_name );
     }