← Back to branch summary

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

« back to all changes in this revision

Viewing changes to phonon/experimental/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/experimental/objectdescription.cpp
29
29
namespace Experimental
30
30
{
31
31
 
 
32
#ifndef PHONON_NO_VIDEOCAPTURE
 
33
 
32
34
VideoCaptureDevice phononVcdToExperimentalVcd(const Phonon::VideoCaptureDevice &vcd)
33
35
{
34
36
    QHash<QByteArray, QVariant> properties;
51
53
    return Phonon::VideoCaptureDevice(vcd.index(), properties);
52
54
}
53
55
 
 
56
#endif // PHONON_NO_VIDEOCAPTURE
 
57
 
54
58
} // Experimental namespace
55
59
} // Phonon namespace
 
 
b'\\ No newline at end of file'