[vlc-commits] commit: Qt: network open, fix caching and add more examples ( Jean-Baptiste Kempf )
git at videolan.org
git at videolan.org
Tue Apr 13 01:34:13 CEST 2010
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Apr 13 01:21:35 2010 +0200| [c8fe44f84a33b5c8e62d330b8fea708849e3a2b7] | committer: Jean-Baptiste Kempf
Qt: network open, fix caching and add more examples
Unfortunately, modules names are access_http access_mms but rtp and live555
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c8fe44f84a33b5c8e62d330b8fea708849e3a2b7
---
modules/gui/qt4/components/open_panels.cpp | 2 +-
modules/gui/qt4/ui/open_net.ui | 68 ++++++++++++++++++---------
2 files changed, 46 insertions(+), 24 deletions(-)
diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 7593a84..148a7b1 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -565,7 +565,7 @@ void NetOpenPanel::updateMRL()
const struct caching_map *r = (const struct caching_map *)
bsearch( qtu(proto), schemes, sizeof(schemes) / sizeof(schemes[0]),
sizeof(schemes[0]), strcmp_void );
- if( r != NULL && module_exists( r->caching ) )
+ if( r )
emit methodChanged( qfu( r->caching ) + qfu( "-caching" ) );
QStringList qsl;
diff --git a/modules/gui/qt4/ui/open_net.ui b/modules/gui/qt4/ui/open_net.ui
index a7de63b..cabba5e 100644
--- a/modules/gui/qt4/ui/open_net.ui
+++ b/modules/gui/qt4/ui/open_net.ui
@@ -1,60 +1,82 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<author>Jean-Baptiste Kempf</author>
<class>OpenNetwork</class>
- <widget class="QWidget" name="OpenNetwork" >
- <property name="geometry" >
+ <widget class="QWidget" name="OpenNetwork">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>409</width>
- <height>137</height>
+ <width>487</width>
+ <height>273</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="title" >
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
<string>Network Protocol</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="label_1" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_1">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
- <string>URL</string>
+ <property name="text">
+ <string>Please enter a network URL:</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>urlText</cstring>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLineEdit" name="urlText" >
- <property name="toolTip" >
+ <item row="1" column="0">
+ <widget class="QLineEdit" name="urlText">
+ <property name="toolTip">
<string>Enter the URL of the network stream here.</string>
</property>
</widget>
</item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#838383;">http://www.example.com/stream.avi</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#838383;">rtp://@1234</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#838383;">mms://mms.examples.com/stream.asx</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#838383;">rtsp://server.example.org:8080/test.sdp</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#838383;">http://www.yourtube.com/watch?v=gg64x</span></p></body></html></string>
+ </property>
+ <property name="margin">
+ <number>5</number>
+ </property>
+ <property name="indent">
+ <number>10</number>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
More information about the vlc-commits
mailing list