Mailinglist Archive: opensuse-commit (1421 mails)

< Previous Next >
commit muse
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 05 May 2008 01:00:04 +0200
  • Message-id: <20080504230005.2E583678182@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package muse
checked in at Mon May 5 01:00:04 CEST 2008.


--------
--- muse/muse.changes 2008-01-14 18:18:54.000000000 +0100
+++ /mounts/work_src_done/STABLE/muse/muse.changes 2008-05-03
08:20:43.000000000 +0200
@@ -1,0 +2,5 @@
+Sat May 3 08:20:33 CEST 2008 - dmueller@xxxxxxx
+
+- fix build against qt4.4
+
+-------------------------------------------------------------------



New:
----
qatomic-qt-4.4.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ muse.spec ++++++
--- /var/tmp/diff_new_pack.SR1204/_old 2008-05-05 00:57:48.000000000 +0200
+++ /var/tmp/diff_new_pack.SR1204/_new 2008-05-05 00:57:48.000000000 +0200
@@ -10,10 +10,11 @@

# norootforbuild

+
Name: muse
Summary: MIDI Music Editor
Version: 1.0pre1
-Release: 7
+Release: 11
License: GPL v2 or later
Group: Productivity/Multimedia/Sound/Midi
Url: http://muse-sequencer.org
@@ -28,6 +29,7 @@
Source3: dspSSE.cpp.amd64
Patch0: muse-1.0pre1-svn331.diff.bz2
Patch2: muse-gcc43fix
+Patch3: qatomic-qt-4.4.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
%define my_provides /tmp/my-provides
@@ -71,6 +73,7 @@
%ifarch x86_64
cp -p %{SOURCE3} al/dspSSE.cpp
%endif
+%patch3

%build
(cd obj && cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make)
@@ -105,202 +108,204 @@
%{_libdir}/qt4/plugins/designer/libawlplugin.so

%changelog
-* Mon Jan 14 2008 - duwe@xxxxxxx
+* Sat May 03 2008 dmueller@xxxxxxx
+- fix build against qt4.4
+* Mon Jan 14 2008 duwe@xxxxxxx
- require fftw3-devel (for zynaddsubfx)
-* Fri Jan 11 2008 - lrupp@xxxxxxx
+* Fri Jan 11 2008 lrupp@xxxxxxx
- require qjackctl (as mentioned in README)
- build only on ix86 and amd64
-* Fri Jan 04 2008 - duwe@xxxxxxx
+* Fri Jan 04 2008 duwe@xxxxxxx
- update to svn revision 331,
- hacked to build on amd64
- fixed for gcc-4.3 compilation
-* Wed Jun 13 2007 - ro@xxxxxxx
+* Wed Jun 13 2007 ro@xxxxxxx
- use texlive instead of tetex
-* Thu Jan 18 2007 - duwe@xxxxxxx
+* Thu Jan 18 2007 duwe@xxxxxxx
- internal DSSI synth "zynaddsubfx" GUI program needs fltk
-* Tue Jan 16 2007 - duwe@xxxxxxx
+* Tue Jan 16 2007 duwe@xxxxxxx
- update to 1.0pre1:
+ Qt4-based, now building with cmake
+ DSSI supported(!)
-* Fri Mar 31 2006 - duwe@xxxxxxx
+* Fri Mar 31 2006 duwe@xxxxxxx
- update to 0.8.1, fixing a newly introduced uninitialized var
-* Wed Jan 25 2006 - mls@xxxxxxx
+* Wed Jan 25 2006 mls@xxxxxxx
- converted neededforbuild to BuildRequires
-* Fri Dec 23 2005 - duwe@xxxxxxx
+* Fri Dec 23 2005 duwe@xxxxxxx
- update to 0.7.2pre4
- fix int 0 termination in execlp with NULL.
-* Thu Oct 13 2005 - duwe@xxxxxxx
+* Thu Oct 13 2005 duwe@xxxxxxx
- gcc-4.1 found deicsonce envelope func returning garbage in
case of error. Fixed.
-* Wed Oct 12 2005 - stbinner@xxxxxxx
+* Wed Oct 12 2005 stbinner@xxxxxxx
- fix wrong include hints to make it compile with Qt 3.3.5
-* Thu Oct 06 2005 - duwe@xxxxxxx
+* Thu Oct 06 2005 duwe@xxxxxxx
- update to latest version (0.7.2pre2)
- add flac requirements for libsndfile
- one more gcc4 fix
-* Thu Apr 14 2005 - yxu@xxxxxxx
+* Thu Apr 14 2005 yxu@xxxxxxx
- fixed for GCC4
-* Thu Jan 27 2005 - tiwai@xxxxxxx
+* Thu Jan 27 2005 tiwai@xxxxxxx
- fixed encoding of README.de (bug #50106)
-* Fri Jan 21 2005 - tiwai@xxxxxxx
+* Fri Jan 21 2005 tiwai@xxxxxxx
- updated to version 0.7.1.
-* Wed Oct 06 2004 - tiwai@xxxxxxx
+* Wed Oct 06 2004 tiwai@xxxxxxx
- fixed segfault when opening a project with -d option (#46814)
-* Fri Sep 17 2004 - tiwai@xxxxxxx
+* Fri Sep 17 2004 tiwai@xxxxxxx
- removed ladcca support, which seems problematic with debug mode.
-* Tue Aug 31 2004 - tiwai@xxxxxxx
+* Tue Aug 31 2004 tiwai@xxxxxxx
- updated to version 0.7.0.
use the icon file included in the package.
-* Wed Apr 14 2004 - tiwai@xxxxxxx
+* Wed Apr 14 2004 tiwai@xxxxxxx
- fixed segfault with 64bit architecture (bug #38786)
-* Thu Jan 15 2004 - tiwai@xxxxxxx
+* Thu Jan 15 2004 tiwai@xxxxxxx
- updated to version 0.6.3.
-* Mon Sep 15 2003 - tiwai@xxxxxxx
+* Mon Sep 15 2003 tiwai@xxxxxxx
- added desktop icon.
-* Thu Sep 04 2003 - tiwai@xxxxxxx
+* Thu Sep 04 2003 tiwai@xxxxxxx
- fixed hang-up with softsynth (bug #29681).
- fixed the installation path and segfault on 64bit archs.
- fixed neededforbuild for ladcca support.
-* Fri Aug 29 2003 - ro@xxxxxxx
+* Fri Aug 29 2003 ro@xxxxxxx
- fix build with recent jack
-* Sat Aug 16 2003 - adrian@xxxxxxx
+* Sat Aug 16 2003 adrian@xxxxxxx
- add desktop file
-* Tue Jul 22 2003 - tiwai@xxxxxxx
+* Tue Jul 22 2003 tiwai@xxxxxxx
- updated to 0.6.1.
-* Thu Jun 05 2003 - ro@xxxxxxx
+* Thu Jun 05 2003 ro@xxxxxxx
- update to 0.6.0 final
- hack to build with current libtool
-* Tue Apr 01 2003 - tiwai@xxxxxxx
+* Tue Apr 01 2003 tiwai@xxxxxxx
- updated to version 0.6.0pre7.
- removed iiwusynth temporarily for moving to fluidsynth.
-* Tue Feb 25 2003 - aj@xxxxxxx
+* Tue Feb 25 2003 aj@xxxxxxx
- Add missing assert includes.
-* Mon Jan 27 2003 - tiwai@xxxxxxx
+* Mon Jan 27 2003 tiwai@xxxxxxx
- fixed the build on x86-64 and ia64 with gcc3.3.
-* Tue Jan 21 2003 - tiwai@xxxxxxx
+* Tue Jan 21 2003 tiwai@xxxxxxx
- fixed the jack driver for the newer version.
-* Thu Jan 16 2003 - tiwai@xxxxxxx
+* Thu Jan 16 2003 tiwai@xxxxxxx
- updated to version 0.6.0pre5.
rpm version is numbered as 0.6.0 w/o preX-suffix.
- added iiwusynth to neededforbuild.
-* Fri Nov 22 2002 - ro@xxxxxxx
+* Fri Nov 22 2002 ro@xxxxxxx
- update to 0.6.0pre3
-* Mon Nov 11 2002 - ro@xxxxxxx
+* Tue Nov 12 2002 ro@xxxxxxx
- changed neededforbuild <xshared> to <x-devel-packages>
- changed neededforbuild <xdevel> to <>
-* Mon Aug 05 2002 - tiwai@xxxxxxx
+* Mon Aug 05 2002 tiwai@xxxxxxx
- updated to the new cvs snapshot.
-* Wed Jul 24 2002 - tiwai@xxxxxxx
+* Wed Jul 24 2002 tiwai@xxxxxxx
- disalbed stk plugins.
-* Thu Jun 27 2002 - tiwai@xxxxxxx
+* Thu Jun 27 2002 tiwai@xxxxxxx
- updated to 0.6.3 from cvs 2002.06.27.
- merged and fixed patches.
-* Thu Jun 27 2002 - ro@xxxxxxx
+* Thu Jun 27 2002 ro@xxxxxxx
- use -fPIC for shared objects
-* Fri May 24 2002 - meissner@xxxxxxx
+* Fri May 24 2002 meissner@xxxxxxx
- %%_lib fixes
-* Fri May 10 2002 - schwab@xxxxxxx
+* Fri May 10 2002 schwab@xxxxxxx
- Fix PIC linking.
-* Thu Apr 11 2002 - tiwai@xxxxxxx
+* Thu Apr 11 2002 tiwai@xxxxxxx
- fixed compile with gcc-3.1.
-* Tue Apr 09 2002 - tiwai@xxxxxxx
+* Tue Apr 09 2002 tiwai@xxxxxxx
- updated to muse-0.5.2 (sync'ed with cvs 2002.04.09)
- using autoreconf instead of given autogen.sh script.
-* Tue Mar 12 2002 - tiwai@xxxxxxx
+* Tue Mar 12 2002 tiwai@xxxxxxx
- added README.SuSE.
-* Thu Mar 07 2002 - tiwai@xxxxxxx
+* Thu Mar 07 2002 tiwai@xxxxxxx
- fixed a bug in opening the help-toc file with unsupported
locales (bug #14647).
-* Fri Feb 08 2002 - tiwai@xxxxxxx
+* Fri Feb 08 2002 tiwai@xxxxxxx
- updated to ver.0.5.1. sync with cvs 2002.02.08.
the package is autotoolized now.
- fixed font loading bugs in bigtimer window.
- removed qt-designer plugin from filelist.
-* Sun Feb 03 2002 - ro@xxxxxxx
+* Sun Feb 03 2002 ro@xxxxxxx
- use readlink for real qt3 dir
-* Wed Jan 16 2002 - tiwai@xxxxxxx
+* Wed Jan 16 2002 tiwai@xxxxxxx
- added rawwaves files from stk.
stk plugin should work now.
- creating obj directory more cleverly.
-* Wed Jan 16 2002 - ro@xxxxxxx
+* Wed Jan 16 2002 ro@xxxxxxx
- use the directory not the link in the filelist
-* Thu Jan 03 2002 - tiwai@xxxxxxx
+* Thu Jan 03 2002 tiwai@xxxxxxx
- updated to muse 0.5.0.
changed from qt-devel-packages to qt3-devel-packages.
-* Fri Nov 09 2001 - ro@xxxxxxx
+* Fri Nov 09 2001 ro@xxxxxxx
- use qt-devel-packages in neededforbuild
-* Mon Oct 15 2001 - sf@xxxxxxx
+* Mon Oct 15 2001 sf@xxxxxxx
- added some missing includes to build with gcc > 2.95
- corrected parameter types declared as size_t, used unsigned int.
I changed them to size_t everywhere, as size_t != unsigned int on any
non 32-bit architecture
-* Wed Oct 10 2001 - tiwai@xxxxxxx
+* Wed Oct 10 2001 tiwai@xxxxxxx
- updated to muse-0.4.13.
-* Mon Aug 20 2001 - tiwai@xxxxxxx
+* Mon Aug 20 2001 tiwai@xxxxxxx
- updated to muse-0.4.8.
-* Thu Aug 16 2001 - tiwai@xxxxxxx
+* Thu Aug 16 2001 tiwai@xxxxxxx
- updated to muse-0.4.7.
-* Fri Jul 13 2001 - tiwai@xxxxxxx
+* Fri Jul 13 2001 tiwai@xxxxxxx
- updated to muse-0.4.4.
-* Mon Jul 09 2001 - tiwai@xxxxxxx
+* Mon Jul 09 2001 tiwai@xxxxxxx
- fixed neededforbuild.
-* Thu Jul 05 2001 - tiwai@xxxxxxx
+* Thu Jul 05 2001 tiwai@xxxxxxx
- updated to muse-0.4.2.
-* Thu Jun 07 2001 - tiwai@xxxxxxx
+* Thu Jun 07 2001 tiwai@xxxxxxx
- updated to muse-0.3.20.
-* Fri May 11 2001 - tiwai@xxxxxxx
+* Fri May 11 2001 tiwai@xxxxxxx
- fixed build.
-* Wed May 09 2001 - tiwai@xxxxxxx
+* Wed May 09 2001 tiwai@xxxxxxx
- updated to muse-0.3.19.
-* Wed Apr 11 2001 - tiwai@xxxxxxx
+* Wed Apr 11 2001 tiwai@xxxxxxx
- updated to muse-0.3.16.
-* Wed Apr 04 2001 - tiwai@xxxxxxx
+* Wed Apr 04 2001 tiwai@xxxxxxx
- updated to muse-0.3.15.
-* Tue Mar 20 2001 - tiwai@xxxxxxx
+* Tue Mar 20 2001 tiwai@xxxxxxx
- fixed neededforbuild.
-* Fri Mar 16 2001 - tiwai@xxxxxxx
+* Fri Mar 16 2001 tiwai@xxxxxxx
- updated to muse-0.3.12.
-* Mon Mar 12 2001 - tiwai@xxxxxxx
+* Mon Mar 12 2001 tiwai@xxxxxxx
- updated to muse-0.3.11.
-* Wed Mar 07 2001 - ro@xxxxxxx
+* Wed Mar 07 2001 ro@xxxxxxx
- changed neededforbuild <mesadev> to <mesa-devel>
-* Wed Mar 07 2001 - tiwai@xxxxxxx
+* Wed Mar 07 2001 tiwai@xxxxxxx
- Updated to muse-0.3.10.
-* Mon Feb 26 2001 - tiwai@xxxxxxx
+* Mon Feb 26 2001 tiwai@xxxxxxx
- Updated to muse-0.3.9.
-* Mon Feb 12 2001 - tiwai@xxxxxxx
+* Mon Feb 12 2001 tiwai@xxxxxxx
- Updated to muse-0.3.7.
-* Fri Feb 09 2001 - tiwai@xxxxxxx
+* Fri Feb 09 2001 tiwai@xxxxxxx
- Updated to muse-0.3.6.
-* Tue Jan 30 2001 - tiwai@xxxxxxx
+* Tue Jan 30 2001 tiwai@xxxxxxx
- Updated to muse-0.3.5.
-* Fri Dec 01 2000 - ro@xxxxxxx
+* Fri Dec 01 2000 ro@xxxxxxx
- added liblcms to neededforbuild
-* Thu Nov 23 2000 - tiwai@xxxxxxx
+* Thu Nov 23 2000 tiwai@xxxxxxx
- Updated to muse-0.2.12.
-* Fri Nov 17 2000 - tiwai@xxxxxxx
+* Fri Nov 17 2000 tiwai@xxxxxxx
- Updated to muse-0.2.10.
-* Fri Nov 17 2000 - ro@xxxxxxx
+* Fri Nov 17 2000 ro@xxxxxxx
- fixed neededforbuild: += libmng-devel
-* Wed Nov 08 2000 - tiwai@xxxxxxx
+* Wed Nov 08 2000 tiwai@xxxxxxx
- Updated to muse-0.2.7.
- Fixed to compile.
-* Mon Nov 06 2000 - ro@xxxxxxx
+* Mon Nov 06 2000 ro@xxxxxxx
- fixed to compile (include spinlock before mc146818rtc)
-* Fri Nov 03 2000 - tiwai@xxxxxxx
+* Fri Nov 03 2000 tiwai@xxxxxxx
- Updated to muse-0.2.6.
- Fixed spec file for long package-name support.
- Excluded plug-ins from provide list.
-* Mon Oct 09 2000 - tiwai@xxxxxxx
+* Mon Oct 09 2000 tiwai@xxxxxxx
- Added libmng to neededforbuild
-* Fri Oct 06 2000 - tiwai@xxxxxxx
+* Fri Oct 06 2000 tiwai@xxxxxxx
- Updated to muse-0.2.4
-* Wed Sep 27 2000 - tiwai@xxxxxxx
+* Wed Sep 27 2000 tiwai@xxxxxxx
- Fixed compile for alpha and ppc.
-* Tue Sep 26 2000 - tiwai@xxxxxxx
+* Tue Sep 26 2000 tiwai@xxxxxxx
- Update to 0.2.3
-* Mon Aug 28 2000 - tiwai@xxxxxxx
+* Mon Aug 28 2000 tiwai@xxxxxxx
- Update to 0.2.1.
- Disable translations (due to change of qt-2.2).
-* Wed Aug 02 2000 - tiwai@xxxxxxx
+* Wed Aug 02 2000 tiwai@xxxxxxx
- Initial version: 0.1.10. No manual document is included.



++++++ qatomic-qt-4.4.diff ++++++
--- muse/driver/alsamidi.cpp
+++ muse/driver/alsamidi.cpp
@@ -43,7 +43,7 @@ bool PortRouteFifo::put(const PortRoute& event)
if (size < PORT_ROUTE_FIFO_SIZE) {
fifo[wIndex] = event;
wIndex = (wIndex + 1) % PORT_ROUTE_FIFO_SIZE;
- q_atomic_increment(&size);
+ size.ref();
return false;
}
return true;
@@ -57,7 +57,7 @@ PortRoute PortRouteFifo::get()
{
PortRoute event(fifo[rIndex]);
rIndex = (rIndex + 1) % PORT_ROUTE_FIFO_SIZE;
- q_atomic_decrement(&size);
+ size.deref();
return event;
}

--- muse/driver/alsamidi.h
+++ muse/driver/alsamidi.h
@@ -24,6 +24,8 @@
#include <alsa/asoundlib.h>
#include "driver.h"

+#include <QtCore/QAtomicInt>
+
class MidiSeq;
class MidiEvent;

@@ -43,7 +45,7 @@ struct PortRoute {

class PortRouteFifo {
PortRoute fifo[PORT_ROUTE_FIFO_SIZE];
- volatile int size;
+ QAtomicInt size;
int wIndex;
int rIndex;

--- muse/audioprefetch.cpp
+++ muse/audioprefetch.cpp
@@ -134,7 +134,7 @@ void AudioPrefetch::msgSeek(unsigned samplePos)
if (samplePos == seekPos)
return;

- q_atomic_increment(&seekCount);
+ seekCount.ref();
PrefetchMsg msg;
msg.id = PREFETCH_SEEK;
msg.pos = samplePos;
@@ -191,6 +191,6 @@ void AudioPrefetch::seek(unsigned seekTo)
writePos = seekTo;
prefetch(true);
seekPos = seekTo;
- q_atomic_decrement(&seekCount);
+ seekCount.deref();
}

--- muse/audioprefetch.h
+++ muse/audioprefetch.h
@@ -24,6 +24,8 @@
#include "thread.h"
#include "fifo.h"

+#include <QtCore/QAtomicInt>
+
//---------------------------------------------------------
// AudioPrefetch
//---------------------------------------------------------
@@ -36,7 +38,7 @@ class AudioPrefetch : public Thread {
virtual void processMsg1(const void*);
void prefetch(bool seekFlag);
void seek(unsigned pos);
- volatile int seekCount;
+ QAtomicInt seekCount;

public:
AudioPrefetch(const char* name);
--- muse/audiowriteback.cpp
+++ muse/audiowriteback.cpp
@@ -65,7 +65,7 @@ void AudioWriteback::start(int priority)
void AudioWriteback::processMsg1(const void*)
{
while (counter) {
- q_atomic_decrement(&counter);
+ counter.deref();
OutputList* ol = song->outputs();
if (!ol->empty()) {
AudioOutput* ao = ol->front();
@@ -88,8 +88,7 @@ void AudioWriteback::processMsg1(const void*)

void AudioWriteback::trigger()
{
- q_atomic_increment(&counter);
- if (counter < 2) {
+ if (counter.ref() < 2) {
if (sendMsg1("0", 1)) {
printf("AudioWriteback::msgTick(): send failed!\n");
}
--- muse/audiowriteback.h
+++ muse/audiowriteback.h
@@ -23,13 +23,15 @@

#include "thread.h"

+#include <QtCore/QAtomicInt>
+
//---------------------------------------------------------
// AudioWriteback
//---------------------------------------------------------

class AudioWriteback : public Thread {
virtual void processMsg1(const void*);
- volatile int counter;
+ QAtomicInt counter;

public:
AudioWriteback(const char* name);
--- muse/fifo.cpp
+++ muse/fifo.cpp
@@ -30,7 +30,6 @@ void FifoBase::clear()
{
ridx = 0;
widx = 0;
- counter = 0;
}

//---------------------------------------------------------
@@ -40,7 +39,7 @@ void FifoBase::clear()
void FifoBase::push()
{
widx = (widx + 1) % FIFO_BUFFER;
- q_atomic_increment(&counter);
+ counter.ref();
}

//---------------------------------------------------------
@@ -50,7 +49,7 @@ void FifoBase::push()
void FifoBase::pop()
{
ridx = (ridx + 1) % FIFO_BUFFER;
- q_atomic_decrement(&counter);
+ counter.deref();
}

//---------------------------------------------------------
--- muse/fifo.h
+++ muse/fifo.h
@@ -21,6 +21,8 @@
#ifndef __FIFO_H__
#define __FIFO_H__

+#include <QtCore/QAtomicInt>
+
const int FIFO_BUFFER = 256;

//---------------------------------------------------------
@@ -56,7 +58,7 @@ class FifoBase {
protected:
int ridx; // read index
int widx; // write index
- volatile int counter; // objects in fifo
+ QAtomicInt counter; // objects in fifo

public:
FifoBase() { clear(); }
--- muse/midififo.cpp
+++ muse/midififo.cpp
@@ -30,7 +30,7 @@ bool MidiFifo::put(const MidiEvent& event)
if (size < MIDI_FIFO_SIZE) {
fifo[wIndex] = event;
wIndex = (wIndex + 1) % MIDI_FIFO_SIZE;
- q_atomic_increment(&size);
+ size.ref();
return false;
}
return true;
@@ -44,7 +44,7 @@ MidiEvent MidiFifo::get()
{
MidiEvent event(fifo[rIndex]);
rIndex = (rIndex + 1) % MIDI_FIFO_SIZE;
- q_atomic_decrement(&size);
+ size.deref();
return event;
}

@@ -64,7 +64,7 @@ MidiEvent MidiFifo::peek()
void MidiFifo::remove()
{
rIndex = (rIndex + 1) % MIDI_FIFO_SIZE;
- q_atomic_decrement(&size);
+ size.deref();
}

//---------------------------------------------------------
@@ -77,7 +77,7 @@ bool MidiOutFifo::put(const MidiOutEvent& event)
if (size < MIDI_FIFO_SIZE) {
fifo[wIndex] = event;
wIndex = (wIndex + 1) % MIDI_FIFO_SIZE;
- q_atomic_increment(&size);
+ size.ref();
return false;
}
return true;
@@ -91,7 +91,7 @@ MidiOutEvent MidiOutFifo::get()
{
MidiOutEvent event(fifo[rIndex]);
rIndex = (rIndex + 1) % MIDI_FIFO_SIZE;
- q_atomic_decrement(&size);
+ size.deref();
return event;
}

--- muse/midififo.h
+++ muse/midififo.h
@@ -26,13 +26,15 @@

#define MIDI_FIFO_SIZE 512

+#include <QtCore/QAtomicInt>
+
//---------------------------------------------------------
// MidiFifo
//---------------------------------------------------------

class MidiFifo {
MidiEvent fifo[MIDI_FIFO_SIZE];
- volatile int size;
+ QAtomicInt size;
int wIndex;
int rIndex;

@@ -74,7 +76,7 @@ typedef MidiOutEventList::const_iterator ciMidiOutEvent;

class MidiOutFifo {
MidiOutEvent fifo[MIDI_FIFO_SIZE];
- volatile int size;
+ QAtomicInt size;
int wIndex;
int rIndex;

--- muse/midiinport.cpp
+++ muse/midiinport.cpp
@@ -198,7 +198,7 @@ void MidiInPort::eventReceived(snd_seq_event_t* ev)
++recordWrite;
if (recordWrite == RECORD_FIFO_SIZE)
recordWrite = 0;
- q_atomic_increment(&recordCount);
+ recordCount.ref();
}
}
#endif
@@ -214,7 +214,7 @@ void MidiInPort::afterProcess()
++recordRead;
if (recordRead >= RECORD_FIFO_SIZE)
recordRead = 0;
- q_atomic_decrement(&recordCount);
+ recordCount.deref();
}
}

--- muse/midiinport.h
+++ muse/midiinport.h
@@ -24,6 +24,8 @@
#include "miditrackbase.h"
#include "midievent.h"

+#include <QtCore/QAtomicInt>
+
static const int RECORD_FIFO_SIZE = 512;

//---------------------------------------------------------
@@ -35,7 +37,7 @@ class MidiInPort : public MidiTrackBase {

MidiEvent recordFifo[RECORD_FIFO_SIZE];
int recordRead, recordWrite;
- volatile int recordCount;
+ QAtomicInt recordCount;
int tmpRecordCount;
int activity[MIDI_CHANNELS];



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread