summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2014-06-24 13:20:12 +0300
committerGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2014-06-24 13:20:12 +0300
commitb3e42e516ae48e0d8623f83d023f4bbe97dcb9b9 (patch)
treea663e7a8bfcbb59a9a690f3ed024b3ffbfde24a1
parent26d51271f27201d0dfecf563ba5ecf10867906b4 (diff)
examples/recorder: cleanup / fixup
-rw-r--r--examples/CMakeLists.txt2
-rw-r--r--examples/examples.dox1
-rw-r--r--examples/recorder/main.cpp3
-rw-r--r--examples/recorder/recorder.ui53
4 files changed, 4 insertions, 55 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index b45915c..548d84f 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -25,7 +25,7 @@ add_subdirectory(appsink-src)
example_distcheck(appsink-src)
add_subdirectory(recorder)
-#example_distcheck(recorder)
+example_distcheck(recorder)
add_subdirectory(voip)
example_distcheck(voip)
diff --git a/examples/examples.dox b/examples/examples.dox
index 372f418..b9f75e8 100644
--- a/examples/examples.dox
+++ b/examples/examples.dox
@@ -65,7 +65,6 @@
* Tasks demonstrated in this example include:
* \li How to create and link elements manually.
* \li How to create and link elements using a pipeline description.
- * \li How to use the QGst::PropertyProbe interface.
* \li How to handle bus messages.
* \li Others...
*/
diff --git a/examples/recorder/main.cpp b/examples/recorder/main.cpp
index b61bfe7..f29b4ab 100644
--- a/examples/recorder/main.cpp
+++ b/examples/recorder/main.cpp
@@ -121,8 +121,7 @@ QGst::BinPtr Recorder::createVideoSrcBin()
}
//set the source's properties
- if (m_ui.videoSourceComboBox->currentIndex() == 0) { //camera
- } else { //screencast
+ if (m_ui.videoSourceComboBox->currentIndex() == 1) { //screencast
videoBin->getElementByName("videosrc")->setProperty("screen-num", m_ui.displayNumSpinBox->value());
}
diff --git a/examples/recorder/recorder.ui b/examples/recorder/recorder.ui
index 7e750db..a22eda3 100644
--- a/examples/recorder/recorder.ui
+++ b/examples/recorder/recorder.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>306</width>
- <height>284</height>
+ <height>291</height>
</rect>
</property>
<property name="windowTitle">
@@ -46,33 +46,6 @@
</item>
</layout>
</item>
- <item>
- <widget class="QStackedWidget" name="audioSourcePropertiesWidget">
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="microphonePage">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QLabel" name="audioDeviceLabel">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Device:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="audioDeviceComboBox"/>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -121,21 +94,15 @@
<widget class="QWidget" name="cameraPage">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
- <widget class="QLabel" name="videoDeviceLabel">
+ <widget class="QLabel" name="emptyLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text">
- <string>Device:</string>
- </property>
</widget>
</item>
- <item>
- <widget class="QComboBox" name="videoDeviceComboBox"/>
- </item>
</layout>
</widget>
<widget class="QWidget" name="screencastPage">
@@ -222,22 +189,6 @@
<resources/>
<connections>
<connection>
- <sender>audioSourceComboBox</sender>
- <signal>currentIndexChanged(int)</signal>
- <receiver>audioSourcePropertiesWidget</receiver>
- <slot>setCurrentIndex(int)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>305</x>
- <y>52</y>
- </hint>
- <hint type="destinationlabel">
- <x>231</x>
- <y>73</y>
- </hint>
- </hints>
- </connection>
- <connection>
<sender>videoSourceComboBox</sender>
<signal>currentIndexChanged(int)</signal>
<receiver>videoSourcePropertiesWidget</receiver>