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

List:       kde-commits
Subject:    extragear/multimedia/kmid/win
From:       Pedro Lopez-Cabanillas <pedro.lopez.cabanillas () gmail ! com>
Date:       2010-04-16 7:48:58
Message-ID: 20100416074858.C39BBAC898 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1115372 by pedrol:

krazy fix

 M  +5 -5      winmidioutput.cpp  
 M  +2 -2      winmidioutput.h  


--- trunk/extragear/multimedia/kmid/win/winmidioutput.cpp #1115371:1115372
@@ -204,7 +204,7 @@
 
     WinMIDIOutput::~WinMIDIOutput()
     {
-        close();
+        closeStream();
         delete d;
     }
 
@@ -230,7 +230,7 @@
         return errstr;
     }
 
-    void WinMIDIOutput::close()
+    void WinMIDIOutput::closeStream()
     {
         MMRESULT res;
         if (d->m_outHandle != 0) {
@@ -244,14 +244,14 @@
         }
     }
 
-    bool WinMIDIOutput::open(unsigned int dev)
+    bool WinMIDIOutput::openStream(unsigned int dev)
     {
         MMRESULT res;
         unsigned int max = midiOutGetNumDevs();
         if ((dev >= max) || (dev < 0))
             return false;
         if (d->m_outHandle != 0)
-            close();
+            closeStream();
         res = midiStreamOpen( &d->m_outHandle, &dev, 1,
                 (DWORD) midiCallback, (DWORD) this, CALLBACK_FUNCTION);
         if (res != MMSYSERR_NOERROR) {
@@ -517,7 +517,7 @@
     {
         if (!d->m_outputDevices.contains(index))
             return false;
-        if (open(index)) {
+        if (openStream(index)) {
             d->m_currentOutput = index;
             return true;
         }
--- trunk/extragear/multimedia/kmid/win/winmidioutput.h #1115371:1115372
@@ -73,8 +73,8 @@
         void sendShortMessage(WinMIDIPacket* msg);
 
         /* Stream IO Methods */
-        bool open(unsigned int dev);
-        void close();
+        bool openStream(unsigned int dev);
+        void closeStream();
         void songOutput();
         void doneHeader( LPMIDIHDR lpMidiHdr );
         void streamPosition( LPMIDIHDR lpMidiHdr );
[prev in list] [next in list] [prev in thread] [next in thread]