Commit dd11b531 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Revert "Fixed open network panel."

This reverts commit 000f1e1f.
parent 9bc8ac74
...@@ -420,21 +420,15 @@ NetOpenPanel::NetOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) : ...@@ -420,21 +420,15 @@ NetOpenPanel::NetOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
CONNECT( ui.timeShift, clicked(), this, updateMRL()); CONNECT( ui.timeShift, clicked(), this, updateMRL());
CONNECT( ui.ipv6, clicked(), this, updateMRL()); CONNECT( ui.ipv6, clicked(), this, updateMRL());
typedef QPair<QString,QString> QPairString; ui.protocolCombo->addItem( "" );
QMap<int, QPairString> protocols; ui.protocolCombo->addItem("HTTP", QVariant("http"));
#define P(value,name,dsc) do { protocols[value] = QPairString( QString(dsc), QString(name) );} while(0) ui.protocolCombo->addItem("HTTPS", QVariant("https"));
P( NO_PROTO, "", "" ); ui.protocolCombo->addItem("FTP", QVariant("ftp"));
P( UDPM_PROTO, "udp", "UDP/RTP (multicast)" ); ui.protocolCombo->addItem("MMS", QVariant("mms"));
P( HTTP_PROTO, "http", "HTTP" ); ui.protocolCombo->addItem("RTSP", QVariant("rtsp"));
P( HTTPS_PROTO, "https", "HTTPS" ); ui.protocolCombo->addItem("UDP/RTP (unicast)", QVariant("udp"));
P( MMS_PROTO, "mms", "MMS" ); ui.protocolCombo->addItem("UDP/RTP (multicast)", QVariant("udp"));
P( FTP_PROTO, "ftp", "FTP" ); ui.protocolCombo->addItem("RTMP", QVariant("rtmp"));
P( RTSP_PROTO, "rtsp", "RTSP" );
P( UDP_PROTO, "udp", "UDP/RTP (unicast)" );
P( RTMP_PROTO, "rtmp", "RTMP" );
#undef P
foreach( QPairString e, protocols ) /* Sorted by key, exactly what we need */
ui.protocolCombo->addItem( e.first, QVariant(e.second.isEmpty() ) );
} }
NetOpenPanel::~NetOpenPanel() NetOpenPanel::~NetOpenPanel()
...@@ -526,7 +520,6 @@ void NetOpenPanel::updateMRL() { ...@@ -526,7 +520,6 @@ void NetOpenPanel::updateMRL() {
else mrl += addr; else mrl += addr;
mrl += QString(":%1").arg( ui.portSpin->value() ); mrl += QString(":%1").arg( ui.portSpin->value() );
emit methodChanged("udp-caching"); emit methodChanged("udp-caching");
break;
case RTMP_PROTO: case RTMP_PROTO:
mrl = "rtmp://" + addr; mrl = "rtmp://" + addr;
emit methodChanged("rtmp-caching"); emit methodChanged("rtmp-caching");
......
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