← Back to branch summary

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

« back to all changes in this revision

Viewing changes to phonon/objectdescription.cpp

  • 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/objectdescription.cpp
125
125
    }
126
126
 
127
127
#ifndef QT_NO_PHONON_PLATFORMPLUGIN
128
 
    // prefer to get the ObjectDescriptionData from the platform plugin for audio devices
129
 
    if (is_audio_device) {
130
 
        PlatformPlugin *platformPlugin = Factory::platformPlugin();
131
 
        if (platformPlugin) {
132
 
            QList<int> indexes = platformPlugin->objectDescriptionIndexes(type);
133
 
            if (indexes.contains(index)) {
134
 
                QHash<QByteArray, QVariant> properties = platformPlugin->objectDescriptionProperties(type, index);
135
 
                return new ObjectDescriptionData(index, properties);
136
 
            }
 
128
    // prefer to get the ObjectDescriptionData from the platform plugin
 
129
    PlatformPlugin *platformPlugin = Factory::platformPlugin();
 
130
    if (platformPlugin) {
 
131
        QList<int> indexes = platformPlugin->objectDescriptionIndexes(type);
 
132
        if (indexes.contains(index)) {
 
133
            QHash<QByteArray, QVariant> properties = platformPlugin->objectDescriptionProperties(type, index);
 
134
            return new ObjectDescriptionData(index, properties);
137
135
        }
138
136
    }
139
137
#endif //QT_NO_PHONON_PLATFORMPLUGIN
157
155
 
158
156
void Phonon::registerMetaTypes()
159
157
{
160
 
    // Register the PhononDeviceAccessList type if it has not been registered yet
161
 
    if (qMetaTypeId<Phonon::DeviceAccess>())
162
 
    {
163
 
        qRegisterMetaType<Phonon::DeviceAccess>();
164
 
        qRegisterMetaTypeStreamOperators<Phonon::DeviceAccess>("Phonon::DeviceAccess");
165
 
    }
166
 
 
167
 
    if (qMetaTypeId<Phonon::DeviceAccessList>())
168
 
    {
169
 
        qRegisterMetaType<Phonon::DeviceAccessList>();
170
 
        qRegisterMetaTypeStreamOperators<Phonon::DeviceAccessList>("Phonon::DeviceAccessList");
171
 
    }
 
158
    // Deprecated, does nothing
172
159
}
173
160
 
174
161
// vim: sw=4 ts=4