Navigation

Changeset 000f1e1fb9253dca219253ee54702cf044aff213

Timestamp:

05/07/08 20:03:31 (5 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1215281011 +0000

git-parent:

[a15af1b90a7ee88f76a1f67c1fdd13efe885a564]

git-author:

Laurent Aimar <fenrir@videolan.org> 1215259052 +0000

Message:

Fixed open network panel.

Files:

r2242c9a	r000f1e1
418	418	CONNECT( ui.ipv6, clicked(), this, updateMRL());
419	419
420		ui.protocolCombo->addItem( "" );
421		ui.protocolCombo->addItem("HTTP", QVariant("http"));
422		ui.protocolCombo->addItem("HTTPS", QVariant("https"));
423		ui.protocolCombo->addItem("FTP", QVariant("ftp"));
424		ui.protocolCombo->addItem("MMS", QVariant("mms"));
425		ui.protocolCombo->addItem("RTSP", QVariant("rtsp"));
426		ui.protocolCombo->addItem("UDP/RTP (unicast)", QVariant("udp"));
427		ui.protocolCombo->addItem("UDP/RTP (multicast)", QVariant("udp"));
428		ui.protocolCombo->addItem("RTMP", QVariant("rtmp"));
	420	typedef QPair<QString,QString> QPairString;
	421	QMap<int, QPairString> protocols;
	422	#define P(value,name,dsc) do { protocols[value] = QPairString( QString(dsc), QString(name) );} while(0)
	423	P( NO_PROTO, "", "" );
	424	P( UDPM_PROTO, "udp", "UDP/RTP (multicast)" );
	425	P( HTTP_PROTO, "http", "HTTP" );
	426	P( HTTPS_PROTO, "https", "HTTPS" );
	427	P( MMS_PROTO, "mms", "MMS" );
	428	P( FTP_PROTO, "ftp", "FTP" );
	429	P( RTSP_PROTO, "rtsp", "RTSP" );
	430	P( UDP_PROTO, "udp", "UDP/RTP (unicast)" );
	431	P( RTMP_PROTO, "rtmp", "RTMP" );
	432	#undef P
	433	foreach( QPairString e, protocols ) /* Sorted by key, exactly what we need */
	434	ui.protocolCombo->addItem( e.first, QVariant(e.second.isEmpty() ) );
429	435	}
430	436
…	…
518	524	mrl += QString(":%1").arg( ui.portSpin->value() );
519	525	emit methodChanged("udp-caching");
	526	break;
520	527	case RTMP_PROTO:
521	528	mrl = "rtmp://" + addr;