- commit
- ddc8149d372b86d9af344d9164b55b2504095c07
- parent
- 6fc5e1681f3609aea6f34f52a021926cb82b5182
- Author
- Tobias Bengfort <tobias.bengfort@gmx.net>
- Date
- 2010-10-29 21:23
clean
Diffstat
| A | gui/errors | 0 | |
| A | gui/make | 1 | + |
| R | rb_expermients/test.cpp -> rb_expermients/rtlayer.cpp | 6 | ++---- |
| R | rb_expermients/test.h -> rb_expermients/rtlayer.h | 23 | +++++++++++++---------- |
| R | rb_expermients/buffer.cpp -> src/buffer.cpp | 0 | |
| R | rb_expermients/buffer.h -> src/buffer.h | 0 | |
| R | rb_expermients/marker.cpp -> src/marker.cpp | 0 | |
| R | rb_expermients/marker.h -> src/marker.h | 2 | +- |
8 files changed, 17 insertions, 15 deletions
diff --git a/gui/errors b/gui/errors
diff --git a/gui/make b/gui/make
@@ -0,0 +1 @@ -1 1 g++ *.h *.cpp ../src/*.h ../src/*.cpp `wx-config --cxxflags --libs`
diff --git a/rb_expermients/test.cpp b/rb_expermients/rtlayer.cpp
@@ -1,7 +1,5 @@ -1 1 #include "rtlayer.h" 1 22 -1 #include "test.h"3 -14 -1 /*5 3 RTlayer::RTlayer() { 6 4 marker; 7 5 } @@ -15,4 +13,4 @@ float RTlayer::getRatio(int i) { 15 13 else 16 14 return NULL; 17 15 }18 -1 */-1 16
diff --git a/rb_expermients/test.h b/rb_expermients/rtlayer.h
@@ -1,9 +1,11 @@ -1 1 #ifndef __XILAYER_H -1 2 #define __XILAYER_H 1 32 -1 //#include <iostream>3 -1 //#include "marker.h"-1 4 #include <iostream> -1 5 #include "../src/marker.h" 4 6 #include <rubberband/RubberBandStretcher.h> 5 76 -1 /*-1 8 7 9 class RTlayer { 8 10 public: 9 11 RTlayer(); @@ -11,10 +13,10 @@ public: 11 13 float getRatio(int i); 12 14 Marker marker; 13 15 };14 -1 */-1 16 15 17 16 18 int main() {17 -1 /*-1 19 18 20 RTlayer layer; 19 21 20 22 int samples=10000000; @@ -24,16 +26,17 @@ int main() { 24 26 layer.marker.add(0,0); 25 27 layer.marker.add(0.4,0.5); 26 28 layer.marker.add(1,1);27 -1 */28 2929 -1 // for (int i=0; i<layer.marker.length()-1; i++) {30 -1 RubberBand::RubberBandStretcher ts(44100, 1);-1 30 for (int i=0; i<layer.marker.length()-1; i++) { -1 31 // RubberBand::RubberBandStretcher ts(44100, 1); 31 32 // ts.study(raw, raw.length, true); 32 33 // ts.process(raw, raw.length, true); 33 34 // int avail=ts.available(); 34 35 // float[] tmpRaw=new tmpRaw[avail]; 35 36 // addRaw(ts.recieve(tmpRaw,avail));36 -1 // }37 -1-1 37 } 38 38 39 39 } -1 40 -1 41 -1 42 #endif
diff --git a/rb_expermients/buffer.cpp b/src/buffer.cpp
diff --git a/rb_expermients/buffer.h b/src/buffer.h
diff --git a/rb_expermients/marker.cpp b/src/marker.cpp
diff --git a/rb_expermients/marker.h b/src/marker.h
@@ -26,7 +26,7 @@ int main() {
26 26 m.add(0,0);
27 27 m.add(1,1);
28 28 m.add(0.5,0.4);
29 -1 std::cout << m.getNew(3) << std::endl;
-1 29 std::cout << m.getNew(1) << std::endl;
30 30 }
31 31 */
32 32