← Back to branch summary

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

« back to all changes in this revision

Viewing changes to phonon/experimental/factory.cpp

  • 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/factory.cpp
58
58
    //}
59
59
    connect(backendObj, SIGNAL(objectDescriptionChanged(ObjectDescriptionType)),
60
60
            SLOT(objectDescriptionChanged(ObjectDescriptionType)));
 
61
    connect(Phonon::Factory::sender(), SIGNAL(availableVideoCaptureDevicesChanged()), Factory::sender(),
 
62
            SLOT(availableVideoCaptureDevicesChanged()));
61
63
}
62
64
 
63
65
FactoryPrivate::~FactoryPrivate()
68
70
{
69
71
    qDebug() << Q_FUNC_INFO << type;
70
72
    switch (type) {
71
 
    case VideoCaptureDeviceType:
72
 
        emit availableVideoCaptureDevicesChanged();
73
 
        break;
74
73
    default:
75
74
        break;
76
75
    }
97
96
    Phonon::BackendInterface *b = qobject_cast<Phonon::BackendInterface *>(Phonon::Factory::backend());
98
97
    if (b) {
99
98
        return Phonon::Factory::registerQObject(b->createObject(
100
 
                    static_cast<Phonon::BackendInterface::Class>(Phonon::Experimental::BackendInterface::VideoDataOutputClass),
 
99
                    static_cast<Phonon::BackendInterface::Class>(Phonon::BackendInterface::VideoDataOutputClass),
101
100
                    parent));
102
101
    }
103
102
    return 0;