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

List:       kde-commits
Subject:    extragear/multimedia/kmid/alsa
From:       Pedro Lopez-Cabanillas <pedro.lopez.cabanillas () gmail ! com>
Date:       2010-06-07 16:36:57
Message-ID: 20100607163657.C4177AC8CD () svn ! kde ! org
[Download RAW message or body]

SVN commit 1135571 by pedrol:

Reverted last commit.

CCBUG: 240391

 M  +0 -1      alsamidiobject.cpp  
 M  +1 -11     alsamidioutput.cpp  
 M  +0 -3      alsamidioutput.h  
 M  +0 -11     player.cpp  
 M  +2 -5      player.h  


--- trunk/extragear/multimedia/kmid/alsa/alsamidiobject.cpp #1135570:1135571
@@ -169,7 +169,6 @@
         d->m_port->setTimestampQueue(d->m_queueId);
         d->m_port->subscribeFromAnnounce();
         d->m_player = new Player(d->m_client, d->m_portId);
-        d->m_out->setPlayer(d->m_player);
         connect( d->m_player, SIGNAL(finished()),
                  SLOT(songFinished()), Qt::QueuedConnection );
         connect( d->m_player, SIGNAL(stopped()),
--- trunk/extragear/multimedia/kmid/alsa/alsamidioutput.cpp #1135570:1135571
@@ -19,7 +19,6 @@
 
 #include "alsamidioutput.h"
 #include "midimapper.h"
-#include "player.h"
 
 #include <cmath>
 #include <alsaclient.h>
@@ -43,7 +42,6 @@
             m_port(0),
             m_loopbkport(0),
             m_mapper(0),
-            m_player(0),
             m_portId(0),
             m_pitchShift(0),
             m_clientFilter(true),
@@ -64,7 +62,6 @@
         MidiPort *m_port;
         MidiPort *m_loopbkport;
         MidiMapper *m_mapper;
-        Player *m_player;
         int m_portId;
         int m_pitchShift;
         bool m_clientFilter;
@@ -383,12 +380,9 @@
             ev->setSource(d->m_portId);
             ev->setSubscribers();
             ev->setDirect();
-            //d->m_client->outputDirect(ev);
-            if (d->m_player != 0) {
-                d->m_player->sendSongEvent(ev);
+            d->m_client->outputDirect(ev);
             }
         }
-    }
 
     void ALSAMIDIOutput::sendNoteOn(int chan, int note, int vel)
     {
@@ -455,10 +449,6 @@
         return d->m_loopbkport;
     }
 
-    void ALSAMIDIOutput::setPlayer(Player* p)
-    {
-        d->m_player = p;
     }
-}
 
 #include "alsamidioutput.moc"
--- trunk/extragear/multimedia/kmid/alsa/alsamidioutput.h #1135570:1135571
@@ -32,8 +32,6 @@
 
 namespace KMid {
 
-    class Player;
-
     class ALSAMIDIOutput : public MIDIOutput {
         Q_OBJECT
     public:
@@ -49,7 +47,6 @@
         int pitchShift();
         MidiClient* client() const;
         MidiPort* loopbackPort();
-        void setPlayer(Player *p);
 
     public Q_SLOTS:
         void setVolume(int channel, qreal);
--- trunk/extragear/multimedia/kmid/alsa/player.cpp #1135570:1135571
@@ -19,8 +19,6 @@
 
 #include "player.h"
 #include "song.h"
-#include <alsaclient.h>
-#include <QMutexLocker>
 
 namespace KMid {
 
@@ -100,15 +98,6 @@
         m_echoResolution = r;
     }
 
-    void Player::sendSongEvent(SequencerEvent* ev)
-    {
-        QMutexLocker locker(&m_outputmutex);
-        if (m_npfds != 0 && m_pfds != 0)
-            SequencerOutputThread::sendSongEvent(ev);
-        else
-            m_MidiClient->outputDirect(ev);
     }
 
-}
-
 #include "player.moc"
--- trunk/extragear/multimedia/kmid/alsa/player.h #1135570:1135571
@@ -20,10 +20,9 @@
 #ifndef INCLUDED_PLAYER_H
 #define INCLUDED_PLAYER_H
 
-#include "song.h"
-#include <playthread.h>
 #include <QObject>
-#include <QMutex>
+#include <playthread.h>
+#include "song.h"
 
 using namespace drumstick;
 
@@ -40,7 +39,6 @@
         virtual SequencerEvent* nextEvent();
         virtual unsigned int getInitialPosition();
         virtual unsigned int getEchoResolution();
-        virtual void sendSongEvent(SequencerEvent* ev);
 
         void setSong(Song* s);
         void resetPosition();
@@ -52,7 +50,6 @@
         SongIterator* m_songIterator;
         qint64 m_songPosition;
         qint32 m_echoResolution;
-        QMutex m_outputmutex;
     };
 
 }
[prev in list] [next in list] [prev in thread] [next in thread]