← Back to branch summary

~ubuntu-branches/ubuntu/trusty/phonon/trusty-updates

« back to all changes in this revision

Viewing changes to phonon/experimental/avcapture.h

  • Committer: Bazaar Package Importer
  • Author(s): Modestas Vainius
  • Date: 2011-03-11 21:39:20 UTC
  • mfrom: (6.1.4 experimental)
  • Revision ID: james.westby@ubuntu.com-20110311213920-pvkmqc1gdpy88uzx
Tags: 4:4.6.0really4.4.4-2
* Drop phonon-backends-dbg from phonon-dbg Recommends/Breaks. No longer
  needed.
* Readd packaging copyright/licensing to debian/copyright.
* Bump libphonon-dev Breaks/Replaces to << 4:4.6.0really4.4.4 for
  libphononexperimental-dev. experimental/avcaptureinterface.h header which
  used to be there up to 4.4.4 (see changelog below).
* Switch debian/rules build engine to dhmk (qt-kde-team/2/*):
  - build-depend on pkg-kde-tools >= 0.11;
  - port debian/rules to dhmk keeping it dh compatible as much as possible.
* Drop unused ${shlibs:Depends} from libphonon-dev and
  libphononexperimental-dev packages.
* Add README.Debian to phonon-backend-null package.
* Remove phonon-backend-null.lintian-overrides: phonon-backend-null is no
  longer and empty package due to README.Debian (see above).
* Release to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
phonon/experimental/avcapture.h
22
22
#ifndef PHONON_EXPERIMENTAL_AVCAPTURE_H
23
23
#define PHONON_EXPERIMENTAL_AVCAPTURE_H
24
24
 
 
25
#if defined(QT_NO_PHONON_VIDEOCAPTURE) || defined(QT_NO_PHONON_AUDIOCAPTURE)
 
26
#define NO_PHONON_AVCAPTURE
 
27
#endif
 
28
 
 
29
#ifndef NO_PHONON_AVCAPTURE
 
30
 
25
31
#include "export.h"
26
32
#include "../medianode.h"
27
33
#include "../phonondefs.h"
58
64
        Q_OBJECT
59
65
        K_DECLARE_PRIVATE(AvCapture)
60
66
        PHONON_OBJECT(AvCapture)
61
 
        Q_PROPERTY(AudioCaptureDevice audioCaptureDevice READ audioCaptureDevice WRITE setAudioCaptureDevice)
62
 
        Q_PROPERTY(VideoCaptureDevice videoCaptureDevice READ videoCaptureDevice WRITE setVideoCaptureDevice)
 
67
        Q_PROPERTY(Phonon::AudioCaptureDevice audioCaptureDevice READ audioCaptureDevice WRITE setAudioCaptureDevice)
 
68
        Q_PROPERTY(Phonon::VideoCaptureDevice videoCaptureDevice READ videoCaptureDevice WRITE setVideoCaptureDevice)
63
69
        public:
64
70
            /**
65
71
             * Returns the currently used capture source for the audio signal.
68
74
             * @see setAudioCaptureDevice(const AudioCaptureDevice &)
69
75
             * @see setAudioCaptureDevice(int)
70
76
             */
71
 
            AudioCaptureDevice audioCaptureDevice() const;
 
77
            Phonon::AudioCaptureDevice audioCaptureDevice() const;
72
78
 
73
79
            /**
74
80
             * Returns the currently used capture source for the video signal.
77
83
             * @see setVideoCaptureDevice(const VideoCaptureDevice &)
78
84
             * @see setVideoCaptureDevice(int)
79
85
             */
80
 
            VideoCaptureDevice videoCaptureDevice() const;
 
86
            Phonon::VideoCaptureDevice videoCaptureDevice() const;
81
87
 
82
88
            /**
83
89
             * Sets the audio capture source to use.
89
95
             * @see audioCaptureDevice
90
96
             * @see setAudioCaptureDevice(int)
91
97
             */
92
 
            void setAudioCaptureDevice(const AudioCaptureDevice &source);
 
98
            void setAudioCaptureDevice(const Phonon::AudioCaptureDevice &source);
93
99
            void setAudioCaptureDevice(Phonon::Category category);
94
100
 
95
101
            /**
102
108
             * @see videoCaptureDevice
103
109
             * @see setVideoCaptureDevice(int)
104
110
             */
105
 
            void setVideoCaptureDevice(const VideoCaptureDevice &source);
 
111
            void setVideoCaptureDevice(const Phonon::VideoCaptureDevice &source);
106
112
            void setVideoCaptureDevice(Phonon::Category category);
107
113
 
 
114
            /**
 
115
             * @deprecated since 4.4.3, use 
 
116
             * setVideoCaptureDevice(const Phonon::VideoCaptureDevice &source) instead
 
117
             */
 
118
            Q_DECL_DEPRECATED void setVideoCaptureDevice(const Phonon::Experimental::VideoCaptureDevice &source);
 
119
 
108
120
        public Q_SLOTS:
109
121
            /**
110
122
             * Start capture.
120
132
} // namespace Experimental
121
133
} // namespace Phonon
122
134
 
 
135
#endif // NO_PHONON_AVCAPTURE
 
136
 
123
137
#endif // PHONON_EXPERIMENTAL_AVCAPTURE_H