← Back to branch summary

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

« back to all changes in this revision

Viewing changes to phonon/globalconfig.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/globalconfig.h
52
52
        bool hideAdvancedDevices() const;
53
53
        void setHideAdvancedDevices(bool hide = true);
54
54
 
55
 
        QHash<QByteArray, QVariant> deviceProperties(Phonon::ObjectDescriptionType deviceType, int index) const;
 
55
        QHash<QByteArray, QVariant> deviceProperties(ObjectDescriptionType deviceType, int index) const;
56
56
 
57
 
        void setAudioOutputDeviceListFor(Phonon::Category category, QList<int> order);
58
 
        QList<int> audioOutputDeviceListFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const;
59
 
        int audioOutputDeviceFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const;
 
57
        void setAudioOutputDeviceListFor(Category category, QList<int> order);
 
58
        QList<int> audioOutputDeviceListFor(Category category, int override = AdvancedDevicesFromSettings) const;
 
59
        int audioOutputDeviceFor(Category category, int override = AdvancedDevicesFromSettings) const;
60
60
        QHash<QByteArray, QVariant> audioOutputDeviceProperties(int index) const;
61
61
 
62
 
#ifndef QT_NO_PHONON_VIDEOCAPTURE
63
 
        QList<int> videoCaptureDeviceListFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const;
64
 
        int videoCaptureDeviceFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const;
 
62
#ifndef PHONON_NO_VIDEOCAPTURE
 
63
        void setVideoCaptureDeviceListFor(CaptureCategory category, QList<int> order);
 
64
        QList<int> videoCaptureDeviceListFor(CaptureCategory category, int override = AdvancedDevicesFromSettings) const;
 
65
        int videoCaptureDeviceFor(CaptureCategory category, int override = AdvancedDevicesFromSettings) const;
65
66
        QHash<QByteArray, QVariant> videoCaptureDeviceProperties(int index) const;
66
 
#endif //QT_NO_PHONON_VIDEOCAPTURE
67
 
 
68
 
#ifndef QT_NO_PHONON_AUDIOCAPTURE
69
 
        void setAudioCaptureDeviceListFor(Phonon::Category category, QList<int> order);
70
 
        QList<int> audioCaptureDeviceListFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const;
71
 
        int audioCaptureDeviceFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const;
 
67
 
 
68
        PHONON_DEPRECATED void setVideoCaptureDeviceListFor(Category category, QList<int> order);
 
69
        PHONON_DEPRECATED QList<int> videoCaptureDeviceListFor(Category category, int override = AdvancedDevicesFromSettings) const;
 
70
        PHONON_DEPRECATED int videoCaptureDeviceFor(Category category, int override = AdvancedDevicesFromSettings) const;
 
71
#endif //PHONON_NO_VIDEOCAPTURE
 
72
 
 
73
#ifndef PHONON_NO_AUDIOCAPTURE
 
74
        void setAudioCaptureDeviceListFor(CaptureCategory category, QList<int> order);
 
75
        QList<int> audioCaptureDeviceListFor(CaptureCategory category, int override = AdvancedDevicesFromSettings) const;
 
76
        int audioCaptureDeviceFor(CaptureCategory category, int override = AdvancedDevicesFromSettings) const;
72
77
        QHash<QByteArray, QVariant> audioCaptureDeviceProperties(int index) const;
73
 
#endif //QT_NO_PHONON_AUDIOCAPTURE
 
78
 
 
79
        PHONON_DEPRECATED void setAudioCaptureDeviceListFor(Category category, QList<int> order);
 
80
        PHONON_DEPRECATED QList<int> audioCaptureDeviceListFor(Category category, int override = AdvancedDevicesFromSettings) const;
 
81
        PHONON_DEPRECATED int audioCaptureDeviceFor(Category category, int override = AdvancedDevicesFromSettings) const;
 
82
#endif //PHONON_NO_AUDIOCAPTURE
74
83
 
75
84
    protected:
76
85
        GlobalConfigPrivate *const k_ptr;