Commit a10edeec authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Add RTMP option on the panel.

parent 16bf241c
...@@ -425,6 +425,7 @@ NetOpenPanel::NetOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) : ...@@ -425,6 +425,7 @@ NetOpenPanel::NetOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
ui.protocolCombo->addItem("RTSP", QVariant("rtsp")); ui.protocolCombo->addItem("RTSP", QVariant("rtsp"));
ui.protocolCombo->addItem("UDP/RTP (unicast)", QVariant("udp")); ui.protocolCombo->addItem("UDP/RTP (unicast)", QVariant("udp"));
ui.protocolCombo->addItem("UDP/RTP (multicast)", QVariant("udp")); ui.protocolCombo->addItem("UDP/RTP (multicast)", QVariant("udp"));
ui.protocolCombo->addItem("RTMP", QVariant("rtmp"));
} }
NetOpenPanel::~NetOpenPanel() NetOpenPanel::~NetOpenPanel()
...@@ -438,10 +439,12 @@ void NetOpenPanel::updateProtocol( int idx_proto ) { ...@@ -438,10 +439,12 @@ void NetOpenPanel::updateProtocol( int idx_proto ) {
QString addr = ui.addressText->text(); QString addr = ui.addressText->text();
QString proto = ui.protocolCombo->itemData( idx_proto ).toString(); QString proto = ui.protocolCombo->itemData( idx_proto ).toString();
ui.timeShift->setEnabled( idx_proto >= UDP_PROTO ); ui.timeShift->setEnabled( idx_proto == UDP_PROTO ||
idx_proto == UDPM_PROTO );
ui.ipv6->setEnabled( idx_proto == UDP_PROTO ); ui.ipv6->setEnabled( idx_proto == UDP_PROTO );
ui.addressText->setEnabled( idx_proto != UDP_PROTO ); ui.addressText->setEnabled( idx_proto != UDP_PROTO );
ui.portSpin->setEnabled( idx_proto >= UDP_PROTO ); ui.portSpin->setEnabled( idx_proto == UDP_PROTO ||
idx_proto == UDPM_PROTO );
if( idx_proto == NO_PROTO ) return; if( idx_proto == NO_PROTO ) return;
...@@ -514,6 +517,11 @@ void NetOpenPanel::updateMRL() { ...@@ -514,6 +517,11 @@ 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");
case RTMP_PROTO:
mrl = "rtmp://" + addr;
emit methodChanged("rtmp-caching");
break;
} }
} }
......
...@@ -57,7 +57,8 @@ enum ...@@ -57,7 +57,8 @@ enum
FTP_PROTO, FTP_PROTO,
RTSP_PROTO, RTSP_PROTO,
UDP_PROTO, UDP_PROTO,
UDPM_PROTO UDPM_PROTO,
RTMP_PROTO
}; };
......
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