Commit 00fa05ae authored by Marian Durkovic's avatar Marian Durkovic

Use RTP for wizard, since it's capable of packet reordering.

parent 7c4d12ee
...@@ -119,10 +119,10 @@ const struct codec acodecs_array[] = ...@@ -119,10 +119,10 @@ const struct codec acodecs_array[] =
const struct method methods_array[] = const struct method methods_array[] =
{ {
{"udp:",N_("UDP Unicast"), N_("Use this to stream to a single computer."), {"rtp",N_("RTP Unicast"), N_("Use this to stream to a single computer."),
N_("Enter the address of the computer to stream to."), N_("Enter the address of the computer to stream to."),
{ MUX_TS, -1,-1,-1,-1,-1,-1,-1,-1 } }, { MUX_TS, -1,-1,-1,-1,-1,-1,-1,-1 } },
{"udp:",N_("UDP Multicast"), {"rtp",N_("RTP Multicast"),
N_("Use this to stream to a dynamic group of computers on a " N_("Use this to stream to a dynamic group of computers on a "
"multicast-enabled network. This is the most efficient method " "multicast-enabled network. This is the most efficient method "
"to stream to several computers, but it does not work over Internet."), "to stream to several computers, but it does not work over Internet."),
...@@ -130,7 +130,7 @@ const struct method methods_array[] = ...@@ -130,7 +130,7 @@ const struct method methods_array[] =
"This must be an IP address between 224.0.0.0 an 239.255.255.255. " "This must be an IP address between 224.0.0.0 an 239.255.255.255. "
"For a private use, enter an address beginning with 239.255."), "For a private use, enter an address beginning with 239.255."),
{ MUX_TS, -1,-1,-1,-1,-1,-1,-1,-1 } }, { MUX_TS, -1,-1,-1,-1,-1,-1,-1,-1 } },
{"http://","HTTP", {"http","HTTP",
N_("Use this to stream to several computers. This method is " N_("Use this to stream to several computers. This method is "
"less efficient, as the server needs to send the " "less efficient, as the server needs to send the "
"stream several times."), "stream several times."),
......
...@@ -115,7 +115,7 @@ END_EVENT_TABLE() ...@@ -115,7 +115,7 @@ END_EVENT_TABLE()
#define PARTIAL _("Use this to read only a part of the stream. " \ #define PARTIAL _("Use this to read only a part of the stream. " \
"You must be able to control the incoming stream " \ "You must be able to control the incoming stream " \
"(for example, a file or a disc, but not an UDP " \ "(for example, a file or a disc, but not a RTP/UDP " \
"network stream.)\n" \ "network stream.)\n" \
"Enter the starting and ending times (in seconds).") "Enter the starting and ending times (in seconds).")
...@@ -168,7 +168,7 @@ END_EVENT_TABLE() ...@@ -168,7 +168,7 @@ END_EVENT_TABLE()
"If you don't know what it means, or if you want to stream on " \ "If you don't know what it means, or if you want to stream on " \
"your local network only, leave this setting to 1." ) "your local network only, leave this setting to 1." )
#define SAP _("When streaming using UDP, you can announce your streams " \ #define SAP _("When streaming using RTP, you can announce your streams " \
"using the SAP/SDP announcing protocol. This way, the clients " \ "using the SAP/SDP announcing protocol. This way, the clients " \
"won't have to type in the multicast address, it will appear " \ "won't have to type in the multicast address, it will appear " \
"in their playlist if they enable the SAP extra interface.\n" \ "in their playlist if they enable the SAP extra interface.\n" \
...@@ -1177,7 +1177,7 @@ void wizEncapPage::OnWizardPageChanging(wxWizardEvent& event) ...@@ -1177,7 +1177,7 @@ void wizEncapPage::OnWizardPageChanging(wxWizardEvent& event)
if( p_parent->GetAction() == ACTION_STREAM ) if( p_parent->GetAction() == ACTION_STREAM )
{ {
if( strstr( p_parent->method, "udp" )) if( strstr( p_parent->method, "rtp" ))
{ {
((wizStreamingExtraPage *)GetNext())->sap_checkbox->Enable(); ((wizStreamingExtraPage *)GetNext())->sap_checkbox->Enable();
((wizStreamingExtraPage *)GetNext())->sap_text->Enable(false); ((wizStreamingExtraPage *)GetNext())->sap_text->Enable(false);
......
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