Changeset 1265

Timestamp:

09/23/07 18:14:11 (11 months ago)

Author:

calvin

Message:

fix parameter view crash and use new critical_section in AnalyzerView?

Location:

trunk/src/buzelib

Files:

• AnalyzerView.cpp (modified) (2 diffs)
• AnalyzerView.h (modified) (1 diff)
• MachineParameterView.cpp (modified) (1 diff)

trunk/src/buzelib/AnalyzerView.cpp

@@ -87 +87 @@
         double frqd = (double)pts / (double)_height;
 
-        queueCritial.Lock();
+        queueCritial.lock();
         deque<vector<int> > copyQueue = fftQueue;
         fftQueue.clear();
-        queueCritial.Unlock();
+        queueCritial.unlock();
 
         while (!copyQueue.empty()) {
@@ -156 +156 @@
         }
 
-        queueCritial.Lock();
+        queueCritial.lock();
     fftQueue.push_back(v);
     while (fftQueue.size()>5) {
         fftQueue.pop_front();
     }
-    queueCritial.Unlock();
+    queueCritial.unlock();
 
     RedrawWindow(0, 0, RDW_INVALIDATE);

trunk/src/buzelib/AnalyzerView.h

@@ -12 +12 @@
         int _xrecord;
 
-    CCriticalSection queueCritial;
+    synchronization::critical_section queueCritial;
     std::deque<std::vector<int> > fftQueue;
     int bufferScreenWidth;

trunk/src/buzelib/MachineParameterView.cpp

@@ -153 +153 @@
         if (plugin->getType() != plugin_type_generator) {
                 plugin = document->getSelectedMachine(0);
-                if (plugin->getType() != plugin_type_generator) return 0;
+                if (!plugin || plugin->getType() != plugin_type_generator) return 0;
         }