merged with trunk

1 files changed, 5 insertions, 9 deletions

diff --git a/muse2/muse/mpevent.h b/muse2/muse/mpevent.h
index fde7c588..9b64f9cd 100644
--- a/muse2/muse/mpevent.h
+++ b/muse2/muse/mpevent.h
@@ -30,13 +30,10 @@
 #include "memory.h"
 
 // Play events ring buffer size
-//#define MIDI_FIFO_SIZE    512  
-// Increased. FE/6/11 p4.0.15 Tim.
-#define MIDI_FIFO_SIZE    2100         
+#define MIDI_FIFO_SIZE    4096         
 
 // Record events ring buffer size
-//#define MIDI_REC_FIFO_SIZE  512
-#define MIDI_REC_FIFO_SIZE  160
+#define MIDI_REC_FIFO_SIZE  256
 
 namespace MusECore {
 
@@ -155,13 +152,12 @@ typedef std::multiset<MidiPlayEvent, std::less<MidiPlayEvent>, audioRTalloc<Midi
 
 struct MPEventList : public MPEL {
       void add(const MidiPlayEvent& ev) { MPEL::insert(ev); }
-      //iterator add(const MidiPlayEvent& ev) { return MPEL::insert(ev); }  // p4.0.15 We need the iterator.
 };
 
 typedef MPEventList::iterator iMPEvent;
 typedef MPEventList::const_iterator ciMPEvent;
 
-/*
+/* DELETETHIS 20 ??
 //---------------------------------------------------------
 //   MREventList
 //    memory allocation in midi thread domain
@@ -193,7 +189,7 @@ class MidiFifo {
 
    public:
       MidiFifo()  { clear(); }
-      bool put(const MidiPlayEvent& /*event*/);   // returns true on fifo overflow
+      bool put(const MidiPlayEvent& event);   // returns true on fifo overflow
       MidiPlayEvent get();
       const MidiPlayEvent& peek(int = 0);
       void remove();
@@ -215,7 +211,7 @@ class MidiRecFifo {
 
    public:
       MidiRecFifo()  { clear(); }
-      bool put(const MidiPlayEvent& /*event*/);   // returns true on fifo overflow
+      bool put(const MidiPlayEvent& event);   // returns true on fifo overflow
       MidiPlayEvent get();
       const MidiPlayEvent& peek(int = 0);
       void remove();