[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdemm/backends/nmm
From:       Matthias Kretz <kretz () kde ! org>
Date:       2005-08-05 12:35:16
Message-ID: 1123245316.859507.6324.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 443234 by mkretz:

adjust to latest changes


 M  +2 -2      backend.cpp  
 M  +1 -1      backend.h  
 M  +0 -8      mediaobject.cpp  
 M  +1 -3      mediaobject.h  


--- branches/work/kdemm/backends/nmm/backend.cpp #443233:443234
@@ -95,10 +95,10 @@
 	return new MediaObject( this, url, parent );
 }
 
-Ifaces::AudioPath* Backend::createAudioPath( QObject* parent )
+Ifaces::AudioPath* Backend::createAudioPath( Ifaces::AudioOutputBase* audioOutput, QObject* parent )
 {
 	return 0;
-	return new AudioPath( this, parent );
+	return new AudioPath( this, audioOutput, parent );
 }
 
 Ifaces::AudioEffect* Backend::createAudioEffect( const QString& type, QObject* parent )
--- branches/work/kdemm/backends/nmm/backend.h #443233:443234
@@ -68,7 +68,7 @@
 			::NMM::NMMApplication* app() const;
 
 			Ifaces::MediaObject*     createMediaObject( const KURL& url, QObject* parent );
-			Ifaces::AudioPath*       createAudioPath( QObject* parent );
+			Ifaces::AudioPath*       createAudioPath( Ifaces::AudioOutputBase* audioOutput, QObject* parent );
 			Ifaces::AudioEffect*     createAudioEffect( const QString& type, QObject* parent );
 			Ifaces::AudioOutput*     createAudioOutput( QObject* parent );
 			Ifaces::AudioDataOutput* createAudioDataOutput( QObject* parent );
--- branches/work/kdemm/backends/nmm/mediaobject.cpp #443233:443234
@@ -121,14 +121,6 @@
 		d->audioPaths << audioPath;
 }
 
-QList<Ifaces::VideoPath*> MediaObject::videoPaths() const
-{
-}
-
-QList<Ifaces::AudioPath*> MediaObject::audioPaths() const
-{
-}
-
 void MediaObject::play()
 {
 	if( d->audioPaths.size() == 1 )
--- branches/work/kdemm/backends/nmm/mediaobject.h #443233:443234
@@ -101,8 +101,6 @@
 
 			virtual void addVideoPath( Ifaces::VideoPath* videoPath );
 			virtual void addAudioPath( Ifaces::AudioPath* audioPath );
-			virtual QList<Ifaces::VideoPath*> videoPaths() const;
-			virtual QList<Ifaces::AudioPath*> audioPaths() const;
 
 		public slots:
 			/**
@@ -151,7 +149,7 @@
 			class Private;
 			Private * d;
 	};
-}} //namespace KDEMM::Ifaces
+}} //namespace KDEMM::NMM
 
 // vim: sw=4 ts=4 tw=80 noet
 #endif // KDEMM_NMM_MEDIAOBJECT_H
[prev in list] [next in list] [prev in thread] [next in thread]