← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/kdemultimedia/intrepid-updates

« back to all changes in this revision

Viewing changes to libkcompactdisc/phonon_interface.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Harald Sitter
  • Date: 2008-07-12 13:07:42 UTC
  • mfrom: (1.2.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20080712130742-rpptq2hakyn2y0zj
Tags: 4:4.0.98-0ubuntu1
* New upstream release candidate
* Bump Standards-Version to 3.8.0
* -dbg depends kdemultimedia

Show diffs side-by-side

added added

removed removed

Lines of Context:
libkcompactdisc/phonon_interface.cpp
21
21
 * CDDA version taken from guitest in phonon test directory
22
22
 */
23
23
 
 
24
#include "phonon_interface.h"
 
25
 
24
26
#include <kdebug.h>
25
27
#include <klocale.h>
26
28
 
34
36
#include <solid/opticaldrive.h>
35
37
#include <solid/opticaldisc.h>
36
38
 
37
 
#include "phonon_interface.h"
38
 
 
39
39
#define WM_MSG_CLASS WM_MSG_CLASS_PLATFORM
40
40
 
41
41
using namespace Phonon;
115
115
                return true;
116
116
        }
117
117
 
118
 
        return false; 
 
118
        return false;
119
119
}
120
120
 
121
121
ProducerWidget *KPhononCompactDiscPrivate::producer()
123
123
        //try to create
124
124
        if(!m_producerWidget) {
125
125
                Solid::Device opticalDevice(m_udi);
126
 
                Solid::OpticalDrive *opticalDrive = opticalDevice.as<Solid::OpticalDrive>();    
 
126
                Solid::OpticalDrive *opticalDrive = opticalDevice.as<Solid::OpticalDrive>();
127
127
 
128
128
                if(opticalDrive) {
129
129
                        Solid::OpticalDisc *opticalDisc = opticalDevice.as<Solid::OpticalDisc>();
181
181
void KPhononCompactDiscPrivate::eject()
182
182
{
183
183
        Solid::Device opticalDevice(m_udi);
184
 
        Solid::OpticalDrive *opticalDrive = opticalDevice.as<Solid::OpticalDrive>();    
 
184
        Solid::OpticalDrive *opticalDrive = opticalDevice.as<Solid::OpticalDrive>();
185
185
        Solid::OpticalDisc *opticalDisc = opticalDevice.as<Solid::OpticalDisc>();
186
186
 
187
187
        if(!opticalDrive || !opticalDisc)
188
188
                return;
189
 
        
 
189
 
190
190
        opticalDrive->eject();
191
191
}
192
192
 
193
193
void KPhononCompactDiscPrivate::closetray()
194
194
{
195
195
        Solid::Device opticalDevice(m_udi);
196
 
        Solid::OpticalDrive *opticalDrive = opticalDevice.as<Solid::OpticalDrive>();    
 
196
        Solid::OpticalDrive *opticalDrive = opticalDevice.as<Solid::OpticalDrive>();
197
197
        Solid::OpticalDisc *opticalDisc = opticalDevice.as<Solid::OpticalDisc>();
198
198
 
199
199
        if(!opticalDrive || opticalDisc)