← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/phonon/oneiric-201108111512

« back to all changes in this revision

Viewing changes to phonon/mediasource_p.h

  • Committer: Bazaar Package Importer
  • Author(s): Romain Perier
  • Date: 2011-03-29 18:52:38 UTC
  • mfrom: (0.5.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110329185238-zsdke31jv37427js
Tags: 4:4.7.0really4.5.0-0ubuntu1
https://launchpad.net/bugs/750480
* New upstream release, LP: #750480
* Create new package libphonon4-designer for the Qt4 Designer plugin
* Add libqzeitgeist to build dependencies
* debian/libphononexperimental4.install:
  Change library name to libphononexperimental4.so.4.*
* Update symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
phonon/mediasource_p.h
6
6
    License as published by the Free Software Foundation; either
7
7
    version 2.1 of the License, or (at your option) version 3, or any
8
8
    later version accepted by the membership of KDE e.V. (or its
9
 
    successor approved by the membership of KDE e.V.), Nokia Corporation 
 
9
    successor approved by the membership of KDE e.V.), Nokia Corporation
10
10
    (or its successors, if any) and the KDE Free Qt Foundation, which shall
11
11
    act as a proxy defined in Section 6 of version 3 of the license.
12
12
 
15
15
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
16
16
    Lesser General Public License for more details.
17
17
 
18
 
    You should have received a copy of the GNU Lesser General Public 
 
18
    You should have received a copy of the GNU Lesser General Public
19
19
    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
20
20
 
21
21
*/
24
24
#define MEDIASOURCE_P_H
25
25
 
26
26
#include "mediasource.h"
 
27
#include "abstractmediastream.h"
27
28
#include "objectdescription.h"
28
 
#include "abstractmediastream.h"
 
29
#include "mrl.h"
29
30
 
30
31
#include <QtCore/QUrl>
31
32
#include <QtCore/QString>
59
60
#endif
60
61
 
61
62
        MediaSource::Type type;
62
 
        QUrl url;
 
63
        Mrl url;
63
64
        Phonon::DiscType discType;
64
65
        QString deviceName;                         // Used for discs
65
66
        Phonon::DeviceAccessList deviceAccessList;  // Used for capture devices
74
75
        QIODevice *ioDevice;
75
76
#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
76
77
 
77
 
#ifndef QT_NO_PHONON_AUDIOCAPTURE
 
78
#if !defined(PHONON_NO_VIDEOCAPTURE) && !defined(PHONON_NO_AUDIOCAPTURE)
 
79
        void setCaptureDevice(Capture::DeviceType deviceType, CaptureCategory category);
 
80
        void setCaptureDevices(const AudioCaptureDevice &audioDevice, const VideoCaptureDevice &videoDevice);
 
81
#endif // !PHONON_NO_VIDEOCAPTURE && !PHONON_NO_AUDIOCAPTURE
 
82
 
 
83
#ifndef PHONON_NO_AUDIOCAPTURE
78
84
        AudioCaptureDevice audioCaptureDevice;
79
85
#endif
80
86
 
81
 
#ifndef QT_NO_PHONON_VIDEOCAPTURE
 
87
#ifndef PHONON_NO_VIDEOCAPTURE
82
88
        VideoCaptureDevice videoCaptureDevice;
83
89
#endif
84
90