[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bphonon=5D_demos=3A_Remove_old_ambiguos_capture_demo?=
From:       Casian Andrei <skeletk13 () gmail ! com>
Date:       2011-02-28 21:50:21
Message-ID: 20110228215021.C3713A60E1 () git ! kde ! org
[Download RAW message or body]

Git commit 585a4e9ccdab12fcd8de15933d83713cb50507b6 by Casian Andrei.
Committed on 28/02/2011 at 18:28.
Pushed by casianandrei into branch 'master'.

Remove old ambiguos capture demos

D  +0    -21   demos/captureapp/CMakeLists.txt     
D  +0    -176  demos/captureapp/captureapp.cpp     
D  +0    -71   demos/captureapp/captureapp.h     
D  +0    -44   demos/captureapp/captureapp_main.cpp     
D  +0    -21   demos/captureapp2/CMakeLists.txt     
D  +0    -148  demos/captureapp2/captureapp2.cpp     
D  +0    -72   demos/captureapp2/captureapp2.h     
D  +0    -47   demos/captureapp2/captureapp2_main.cpp     

http://commits.kde.org/phonon/585a4e9ccdab12fcd8de15933d83713cb50507b6

diff --git a/demos/captureapp/CMakeLists.txt b/demos/captureapp/CMakeLists.txt
deleted file mode 100644
index f5da721..0000000
--- a/demos/captureapp/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-project(captureapp)
-cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)
-
-find_package(Qt4 REQUIRED)
-include(${QT_USE_FILE})
-
-find_package(Phonon REQUIRED)
-
-add_definitions(${QT_DEFINITIONS} ${PHONON_DEFINITIONS})
-include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${PHONON_INCLUDES})
-
-set(captureapp_SRCS
-    captureapp_main.cpp
-    captureapp.cpp
-)
-
-qt4_automoc(${captureapp_SRCS})
-
-add_executable(captureapp ${captureapp_SRCS} ${captureapp_MOC_SRCS})
-
-target_link_libraries(captureapp ${QT_LIBRARIES} phonon)
diff --git a/demos/captureapp/captureapp.cpp b/demos/captureapp/captureapp.cpp
deleted file mode 100644
index 00928b7..0000000
--- a/demos/captureapp/captureapp.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/*  This file is part of the KDE project
- *  Copyright (C) 2010 Casian Andrei <skeletk13@gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) version 3, or any
- *  later version accepted by the membership of KDE e.V. (or its
- *  successor approved by the membership of KDE e.V.), Nokia Corporation
- *  (or its successors, if any) and the KDE Free Qt Foundation, which shall
- *  act as a proxy defined in Section 6 of version 3 of the license.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "captureapp.h"
-
-MediaPlayer::MediaPlayer(QWidget *parent, Qt::WindowFlags f)
-    : QWidget(parent, f)
-{
-    m_videoDeviceModel = NULL;
-    m_audioDeviceModel = NULL;
-
-    QVBoxLayout *layout = new QVBoxLayout(this);
-
-    m_vwidget = new Phonon::VideoWidget(this);
-    m_vwidget->setMinimumSize(QSize(400, 300));
-    m_vwidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    layout->addWidget(m_vwidget);
-
-    m_aoutput = new Phonon::AudioOutput(this);
-
-    m_media = new Phonon::MediaObject(this);
-
-    Phonon::createPath(m_media, m_aoutput);
-    Phonon::createPath(m_media, m_vwidget);
-
-    QHBoxLayout *deviceNameLayout = new QHBoxLayout();
-
-    m_videoCaptureButton = new QRadioButton("Video", this);
-    m_audioCaptureButton = new QRadioButton("Audio", this);
-
-    connect(m_videoCaptureButton, SIGNAL(pressed()), this, SLOT(setVideoCapture()));
-    connect(m_audioCaptureButton, SIGNAL(pressed()), this, SLOT(setAudioCapture()));
-
-    m_deviceNameCombo = new QComboBox(this);
-    m_deviceNameCombo->setEditable(false);
-    connect(m_deviceNameCombo, SIGNAL(activated(int)), this, SLOT(setDeviceIndex(int)));
-    updateDeviceList();
-
-    deviceNameLayout->addWidget(m_videoCaptureButton);
-    deviceNameLayout->addWidget(m_audioCaptureButton);
-    deviceNameLayout->addWidget(m_deviceNameCombo);
-
-    layout->addItem(deviceNameLayout);
-
-    m_playButton = new QPushButton(this);
-    m_playButton->setText("Play");
-    connect(m_playButton, SIGNAL(clicked()), m_media, SLOT(play()));
-
-    m_pauseButton = new QPushButton(this);
-    m_pauseButton->setText("Pause");
-    connect(m_pauseButton, SIGNAL(clicked()), m_media, SLOT(pause()));
-
-    m_stopButton = new QPushButton(this);
-    m_stopButton->setText("Stop");
-    connect(m_stopButton, SIGNAL(clicked()), m_media, SLOT(stop()));
-
-    QHBoxLayout *buttonsLayout = new QHBoxLayout();
-    buttonsLayout->addWidget(m_playButton);
-    buttonsLayout->addWidget(m_pauseButton);
-    buttonsLayout->addWidget(m_stopButton);
-    layout->addItem(buttonsLayout);
-
-    m_volumeSlider = new Phonon::VolumeSlider(this);
-    layout->addWidget(m_volumeSlider);
-    m_volumeSlider->setAudioOutput(m_aoutput);
-}
-
-MediaPlayer::~MediaPlayer()
-{
-}
-
-void MediaPlayer::setVideoCapture()
-{
-    m_deviceNameCombo->setModel(m_videoDeviceModel);
-    m_vwidget->setEnabled(true);
-    setDeviceIndex(0);
-}
-
-void MediaPlayer::setAudioCapture()
-{
-    m_deviceNameCombo->setModel(m_audioDeviceModel);
-    m_vwidget->setEnabled(false);
-    setDeviceIndex(0);
-}
-
-void MediaPlayer::setDeviceIndex(int index)
-{
-    Phonon::MediaSource mediaSource;
-    QModelIndex mi;
-
-#ifndef PHONON_NO_VIDEOCAPTURE
-    if (m_videoCaptureButton->isChecked()) {
-        mi = m_videoDeviceModel->index(index, 0, QModelIndex());
-        Q_ASSERT(mi.isValid());
-
-        Phonon::VideoCaptureDevice vc = m_videoDeviceModel->modelData(mi);
-        Q_ASSERT(vc.isValid());
-
-        mediaSource = Phonon::MediaSource(vc);
-        Q_ASSERT(!mediaSource.deviceAccessList().isEmpty());
-        Q_ASSERT(!mediaSource.deviceAccessList().first().first.isEmpty());
-        Q_ASSERT(!mediaSource.deviceAccessList().first().second.isEmpty());
-    }
-#endif // PHONON_NO_VIDEOCAPTURE
-
-#ifndef PHONON_NO_AUDIOCAPTURE
-    if (m_audioCaptureButton->isChecked()) {
-        mi = m_audioDeviceModel->index(index, 0, QModelIndex());
-        Q_ASSERT(mi.isValid());
-
-        Phonon::AudioCaptureDevice ac = m_audioDeviceModel->modelData(mi);
-        Q_ASSERT(ac.isValid());
-
-        mediaSource = Phonon::MediaSource(ac);
-        Q_ASSERT(!mediaSource.deviceAccessList().isEmpty());
-        Q_ASSERT(!mediaSource.deviceAccessList().first().first.isEmpty());
-        Q_ASSERT(!mediaSource.deviceAccessList().first().second.isEmpty());
-    }
-#endif // PHONON_NO_AUDIOCAPTURE
-
-    m_media->setCurrentSource(mediaSource);
-    m_media->play();
-}
-
-void MediaPlayer::updateDeviceList()
-{
-#ifndef PHONON_NO_VIDEOCAPTURE
-    QList<Phonon::VideoCaptureDevice> lv = Phonon::BackendCapabilities::availableVideoCaptureDevices();
-
-    if (!m_videoDeviceModel)
-        m_videoDeviceModel = new Phonon::VideoCaptureDeviceModel(lv, 0);
-
-    Q_ASSERT(m_videoDeviceModel->rowCount() >= 0);
-
-    if (m_videoDeviceModel->rowCount() == 0)
-        QMessageBox::warning(this, "Warning", "No video capture devices found.");
-#else
-    QMessageBox::critical(this, "Error", "Video capture is disabled.");
-#endif // PHONON_NO_VIDEOCAPTURE
-
-#ifndef PHONON_NO_AUDIOCAPTURE
-    QList<Phonon::AudioCaptureDevice> la = Phonon::BackendCapabilities::availableAudioCaptureDevices();
-
-    if (!m_audioDeviceModel)
-        m_audioDeviceModel = new Phonon::AudioCaptureDeviceModel(la, 0);
-
-    Q_ASSERT(m_audioDeviceModel->rowCount() >= 0);
-
-    if (m_videoDeviceModel->rowCount() == 0)
-        QMessageBox::warning(this, "Warning", "No audio capture devices found.");
-#else
-    QMessageBox::critical(this, "Error", "Audio capture is disabled.");
-#endif // PHONON_NO_AUDIOCAPTURE
-}
-
-#include "captureapp.moc"
-
diff --git a/demos/captureapp/captureapp.h b/demos/captureapp/captureapp.h
deleted file mode 100644
index 7ced3e7..0000000
--- a/demos/captureapp/captureapp.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*  This file is part of the KDE project
- *  Copyright (C) 2010 Casian Andrei <skeletk13@gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) version 3, or any
- *  later version accepted by the membership of KDE e.V. (or its
- *  successor approved by the membership of KDE e.V.), Nokia Corporation
- *  (or its successors, if any) and the KDE Free Qt Foundation, which shall
- *  act as a proxy defined in Section 6 of version 3 of the license.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef CAPTUREAPP_H
-#define CAPTUREAPP_H
-
-#include <Qt/QtCore>
-#include <Qt/QtGui>
-#include <backendcapabilities.h>
-#include <objectdescription.h>
-#include <audiooutput.h>
-#include <videoplayer.h>
-#include <videowidget.h>
-#include <volumeslider.h>
-#include <mediaobject.h>
-#include <globalconfig.h>
-#include <objectdescriptionmodel.h>
-
-class MediaPlayer : public QWidget
-{
-    Q_OBJECT
-
-    public:
-        MediaPlayer(QWidget *parent = 0, Qt::WindowFlags f = 0);
-        ~MediaPlayer();
-
-    public slots:
-        void setVideoCapture();
-        void setAudioCapture();
-        void setDeviceIndex(int index);
-
-    private:
-        void updateDeviceList();
-
-    private:
-        Phonon::MediaObject *m_media;
-        Phonon::AudioOutput *m_aoutput;
-        Phonon::VideoWidget *m_vwidget;
-        Phonon::VolumeSlider *m_volumeSlider;
-        Phonon::VideoCaptureDeviceModel *m_videoDeviceModel;
-        Phonon::AudioCaptureDeviceModel *m_audioDeviceModel;
-
-        QPushButton *m_playButton;
-        QPushButton *m_pauseButton;
-        QPushButton *m_stopButton;
-        QRadioButton *m_audioCaptureButton;
-        QRadioButton *m_videoCaptureButton;
-        QComboBox *m_deviceNameCombo;
-};
-
-#endif // CAPTUREAPP_H
-
diff --git a/demos/captureapp/captureapp_main.cpp b/demos/captureapp/captureapp_main.cpp
deleted file mode 100644
index da66a42..0000000
--- a/demos/captureapp/captureapp_main.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  This file is part of the KDE project
- *  Copyright (C) 2010 Casian Andrei <skeletk13@gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) version 3, or any
- *  later version accepted by the membership of KDE e.V. (or its
- *  successor approved by the membership of KDE e.V.), Nokia Corporation
- *  (or its successors, if any) and the KDE Free Qt Foundation, which shall
- *  act as a proxy defined in Section 6 of version 3 of the license.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/*
- * This demo tries to capture from a single device, video or audio.
- * Video and audio is not captured at the same time.
- * 
- * It shows how to use Phonon's MediaSource, VideoCaptureDevice and AudioCaptureDevice
- * classes to capture video or audio. Phonon's capture device models are used to
- * populate the combo box that selects the device.
- */
-
-#include "captureapp.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    QApplication::setApplicationName("Phonon Capture Demo Application");
-
-    MediaPlayer mp;
-    mp.setWindowTitle("Phonon Capture Demo Application");
-    mp.show();
-
-    return app.exec();
-}
diff --git a/demos/captureapp2/CMakeLists.txt b/demos/captureapp2/CMakeLists.txt
deleted file mode 100644
index b941c52..0000000
--- a/demos/captureapp2/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-project(captureapp2)
-cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)
-
-find_package(Qt4 REQUIRED)
-include(${QT_USE_FILE})
-
-find_package(Phonon REQUIRED)
-
-add_definitions(${QT_DEFINITIONS} ${PHONON_DEFINITIONS})
-include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${PHONON_INCLUDES})
-
-set(captureapp2_SRCS
-    captureapp2_main.cpp
-    captureapp2.cpp
-)
-
-qt4_automoc(${captureapp2_SRCS})
-
-add_executable(captureapp2 ${captureapp2_SRCS} ${captureapp2_MOC_SRCS})
-
-target_link_libraries(captureapp2 ${QT_LIBRARIES} phonon phononexperimental)
diff --git a/demos/captureapp2/captureapp2.cpp b/demos/captureapp2/captureapp2.cpp
deleted file mode 100644
index 621e233..0000000
--- a/demos/captureapp2/captureapp2.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/*  This file is part of the KDE project
- *  Copyright (C) 2010 Casian Andrei <skeletk13@gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) version 3, or any
- *  later version accepted by the membership of KDE e.V. (or its
- *  successor approved by the membership of KDE e.V.), Nokia Corporation
- *  (or its successors, if any) and the KDE Free Qt Foundation, which shall
- *  act as a proxy defined in Section 6 of version 3 of the license.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "captureapp2.h"
-
-MediaPlayer::MediaPlayer(QWidget *parent)
-: QWidget(parent)
-{
-    m_videoDeviceModel = NULL;
-    m_audioDeviceModel = NULL;
-
-    QVBoxLayout *layout = new QVBoxLayout(this);
-
-    m_vwidget = new Phonon::VideoWidget(this);
-    m_vwidget->setMinimumSize(QSize(400, 300));
-    m_vwidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    layout->addWidget(m_vwidget);
-
-    m_aoutput = new Phonon::AudioOutput();
-
-    m_avcapture = new Phonon::Experimental::AvCapture();
-
-    if (!Phonon::createPath(m_avcapture, m_aoutput).isValid())
-        QMessageBox::critical(this, "Error", "Your backend may not support audio capturing.");
-
-    if (!Phonon::createPath(m_avcapture, m_vwidget).isValid())
-        QMessageBox::critical(this, "Error", "Your backend may not support video capturing.");
-
-    QHBoxLayout *deviceNameLayout = new QHBoxLayout(this);
-
-    m_videoDeviceCombo = new QComboBox(this);
-    m_videoDeviceCombo->setEditable(false);
-    m_audioDeviceCombo = new QComboBox(this);
-    m_audioDeviceCombo->setEditable(false);
-    deviceNameLayout->addWidget(m_videoDeviceCombo);
-    deviceNameLayout->addWidget(m_audioDeviceCombo);
-    connect(m_videoDeviceCombo, SIGNAL(activated(int)), this, SLOT(setVideoDeviceIndex(int)));
-    connect(m_audioDeviceCombo, SIGNAL(activated(int)), this, SLOT(setAudioDeviceIndex(int)));
-    updateDeviceList();
-
-    layout->addItem(deviceNameLayout);
-
-    m_playButton = new QPushButton(this);
-    m_playButton->setText("Start");
-    connect(m_playButton, SIGNAL(clicked()), m_avcapture, SLOT(start()));
-
-    m_stopButton = new QPushButton(this);
-    m_stopButton->setText("Stop");
-    connect(m_stopButton, SIGNAL(clicked()), m_avcapture, SLOT(stop()));
-
-    QHBoxLayout *buttonsLayout = new QHBoxLayout(this);
-    buttonsLayout->addWidget(m_playButton);
-    buttonsLayout->addWidget(m_stopButton);
-    layout->addItem(buttonsLayout);
-
-    m_volumeSlider = new Phonon::VolumeSlider(this);
-    layout->addWidget(m_volumeSlider);
-    m_volumeSlider->setAudioOutput(m_aoutput);
-
-    setLayout(layout);
-}
-
-MediaPlayer::~MediaPlayer()
-{
-    delete m_aoutput;
-    delete m_avcapture;
-}
-
-void MediaPlayer::setVideoDeviceIndex(int index)
-{
-#ifndef PHONON_NO_VIDEOCAPTURE
-    QModelIndex mi = m_videoDeviceModel->index(index, 0, QModelIndex());
-    Q_ASSERT(mi.isValid());
-
-    Phonon::VideoCaptureDevice vc = m_videoDeviceModel->modelData(mi);
-    Q_ASSERT(vc.isValid());
-
-    m_avcapture->setVideoCaptureDevice(vc);
-#endif
-}
-
-void MediaPlayer::setAudioDeviceIndex(int index)
-{
-#ifndef PHONON_NO_AUDIOCAPTURE
-    QModelIndex mi = m_audioDeviceModel->index(index, 0, QModelIndex());
-    Q_ASSERT(mi.isValid());
-
-    Phonon::AudioCaptureDevice ac = m_audioDeviceModel->modelData(mi);
-    Q_ASSERT(ac.isValid());
-
-    m_avcapture->setAudioCaptureDevice(ac);
-#endif // PHONON_NO_AUDIOCAPTURE
-}
-
-void MediaPlayer::updateDeviceList()
-{
-#ifndef PHONON_NO_VIDEOCAPTURE
-    QList<Phonon::VideoCaptureDevice> vl = Phonon::BackendCapabilities::availableVideoCaptureDevices();
-
-    if (!m_videoDeviceModel)
-        m_videoDeviceModel = new Phonon::VideoCaptureDeviceModel(vl, 0);
-    m_videoDeviceCombo->setModel(m_videoDeviceModel);
-
-    Q_ASSERT(m_videoDeviceModel->rowCount() >= 0);
-
-    if (m_videoDeviceModel->rowCount() == 0)
-        QMessageBox::critical(this, "Error", "No video capture devices found.");
-#else
-    QMessageBox::critical(this, "Error", "Video capture is disabled.");
-#endif
-
-#ifndef PHONON_NO_AUDIOCAPTURE
-    QList<Phonon::AudioCaptureDevice> al = Phonon::BackendCapabilities::availableAudioCaptureDevices();
-
-    if (!m_audioDeviceModel)
-        m_audioDeviceModel = new Phonon::AudioCaptureDeviceModel(al, 0);
-    m_audioDeviceCombo->setModel(m_audioDeviceModel);
-
-    Q_ASSERT(m_audioDeviceModel->rowCount() >= 0);
-
-    if (m_audioDeviceModel->rowCount() == 0)
-        QMessageBox::critical(this, "Error", "No audio capture devices found.");
-#else
-    QMessageBox::critical(this, "Error", "Audio capture is disabled.");
-#endif
-}
-
-#include "captureapp2.moc"
-
diff --git a/demos/captureapp2/captureapp2.h b/demos/captureapp2/captureapp2.h
deleted file mode 100644
index 3854a96..0000000
--- a/demos/captureapp2/captureapp2.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*  This file is part of the KDE project
- *  Copyright (C) 2010 Casian Andrei <skeletk13@gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) version 3, or any
- *  later version accepted by the membership of KDE e.V. (or its
- *  successor approved by the membership of KDE e.V.), Nokia Corporation
- *  (or its successors, if any) and the KDE Free Qt Foundation, which shall
- *  act as a proxy defined in Section 6 of version 3 of the license.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef PHONON_TEST_H
-#define PHONON_TEST_H
-
-#include <Qt/QtCore>
-#include <Qt/QtGui>
-#include <backendcapabilities.h>
-#include <objectdescription.h>
-#include <audiooutput.h>
-#include <videoplayer.h>
-#include <videowidget.h>
-#include <volumeslider.h>
-#include <mediaobject.h>
-#include <globalconfig.h>
-#include <objectdescriptionmodel.h>
-#include <experimental/avcapture.h>
-
-class MediaPlayer : public QWidget
-{
-    Q_OBJECT
-
-    public:
-        MediaPlayer(QWidget *parent);
-        ~MediaPlayer();
-
-    public slots:
-        void setVideoDeviceIndex(int index);
-        void setAudioDeviceIndex(int index);
-
-    private:
-        void updateDeviceList();
-
-    private:
-        Phonon::Experimental::AvCapture *m_avcapture;
-        Phonon::AudioOutput *m_aoutput;
-        Phonon::VideoWidget *m_vwidget;
-        Phonon::VolumeSlider *m_volumeSlider;
-        Phonon::VideoCaptureDeviceModel *m_videoDeviceModel;
-        Phonon::AudioCaptureDeviceModel *m_audioDeviceModel;
-
-        QPushButton *m_playButton;
-        QPushButton *m_stopButton;
-        QComboBox *m_videoDeviceCombo;
-        QComboBox *m_audioDeviceCombo;
-};
-
-
-#endif
-
-
-
diff --git a/demos/captureapp2/captureapp2_main.cpp b/demos/captureapp2/captureapp2_main.cpp
deleted file mode 100644
index 0211ecd..0000000
--- a/demos/captureapp2/captureapp2_main.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  This file is part of the KDE project
- *  Copyright (C) 2010 Casian Andrei <skeletk13@gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) version 3, or any
- *  later version accepted by the membership of KDE e.V. (or its
- *  successor approved by the membership of KDE e.V.), Nokia Corporation
- *  (or its successors, if any) and the KDE Free Qt Foundation, which shall
- *  act as a proxy defined in Section 6 of version 3 of the license.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/*
- * This demo uses the AVCapture class from Phonon to capture video and audio
- * at the same time. The object of this class is connected to a VideoWidget and
- * an AudioOutput.
- * 
- * If you only want to capture video, or only audio, see the first capture demo.
- * 
- * Both the video capture device and the audio capture device can be selected from
- * their own combo boxes. If you have a device that supports both video and audio
- * capture, it should show in both combo boxes.
- */
-
-#include "captureapp2.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    QApplication::setApplicationName("Phonon AVCapture Demo");
-
-    MediaPlayer mp(NULL);
-    mp.setWindowTitle("Phonon AVCapture Demo");
-    mp.show();
-
-    return app.exec();
-}


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic