[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src commands/AudioClipExternalProcessi...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso/src commands/AudioClipExternalProcessi... |
|
Date: |
Wed, 18 Apr 2007 12:52:54 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/04/18 12:52:54
Modified files:
src/commands : AudioClipExternalProcessing.cpp Import.cpp
src/core : AudioClip.h
src/traverso/songcanvas: AudioClipView.cpp
src/traverso/ui: MemoryConfigPage.ui
Log message:
* temporary fix for non-initialized audioclip gain curve
* audio waveform (classical only) painting merges 2 pixels into one
which is basically the same as painting with one higher zoom level
translated by a factor 2
reason: test to see if it lowers cpu significantly....
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/AudioClipExternalProcessing.cpp?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Import.cpp?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.h?cvsroot=traverso&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/MemoryConfigPage.ui?cvsroot=traverso&r1=1.2&r2=1.3
Patches:
Index: commands/AudioClipExternalProcessing.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/AudioClipExternalProcessing.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- commands/AudioClipExternalProcessing.cpp 2 Apr 2007 21:05:43 -0000
1.2
+++ commands/AudioClipExternalProcessing.cpp 18 Apr 2007 12:52:53 -0000
1.3
@@ -127,6 +127,8 @@
m_resultingclip->set_track(m_clip->get_track());
m_resultingclip->set_audio_source(source);
m_resultingclip->set_track_start_frame(m_clip->get_track_start_frame());
+ // FIXME!!!!!!!!!!!!!!!!!!!!
+ m_resultingclip->init_gain_envelope();
}
Index: commands/Import.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Import.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- commands/Import.cpp 2 Apr 2007 21:05:43 -0000 1.18
+++ commands/Import.cpp 18 Apr 2007 12:52:53 -0000 1.19
@@ -117,6 +117,8 @@
m_clip->set_song(m_track->get_song());
m_clip->set_track(m_track);
m_clip->set_track_start_frame(0);
+ // FIXME!!!!!!!!!!!!!!!!!!!!
+ m_clip->init_gain_envelope();
if (AudioClip* lastClip = m_track->get_cliplist().get_last()) {
m_clip->set_track_start_frame( lastClip->get_track_end_frame()
+ 1);
Index: core/AudioClip.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- core/AudioClip.h 17 Apr 2007 19:56:45 -0000 1.41
+++ core/AudioClip.h 18 Apr 2007 12:52:53 -0000 1.42
@@ -129,6 +129,8 @@
QDomNode m_domNode;
+ void init_gain_envelope();
+
private:
Track* m_track;
Song* m_song;
@@ -161,7 +163,6 @@
int m_refcount;
void init();
- void init_gain_envelope();
void set_source_end_frame(nframes_t frame);
void set_source_start_frame(nframes_t frame);
void set_track_end_frame(nframes_t endFrame);
Index: traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- traverso/songcanvas/AudioClipView.cpp 17 Apr 2007 11:51:20 -0000
1.42
+++ traverso/songcanvas/AudioClipView.cpp 18 Apr 2007 12:52:53 -0000
1.43
@@ -416,10 +416,18 @@
if (m_classicView) {
QPolygonF polygonbottom(pixelcount);
- for (int x = xstart; x < (pixelcount+xstart);
x++) {
+ for (int x = xstart; x < (pixelcount+xstart);
x+=2) {
+ if ( (x + 2) < (pixelcount+xstart)) {
+ float ytop =
f_max(pixeldata[chan][bufferpos], pixeldata[chan][bufferpos + 2]);
+ float ybotom =
f_max(pixeldata[chan][bufferpos + 1], pixeldata[chan][bufferpos + 3]);
+ polygontop.append( QPointF(x,
ytop) );
+ polygonbottom.append(
QPointF(x, - ybotom) );
+ bufferpos += 4;
+ } else {
polygontop.append( QPointF(x,
pixeldata[chan][bufferpos++]) );
polygonbottom.append( QPointF(x, -
pixeldata[chan][bufferpos++]) );
}
+ }
path.addPolygon(polygontop);
path.lineTo(polygonbottom.last());
Index: traverso/ui/MemoryConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/MemoryConfigPage.ui,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- traverso/ui/MemoryConfigPage.ui 5 Apr 2007 13:55:10 -0000 1.2
+++ traverso/ui/MemoryConfigPage.ui 18 Apr 2007 12:52:53 -0000 1.3
@@ -70,7 +70,7 @@
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">(one for each audioclip
* channel count) need to be refilled!</p></body></html></string>
</property>
<property name="text" >
- <string>Read / Write buffer size (seconds)</string>
+ <string>Read buffer size (seconds)</string>
</property>
</widget>
</item>