[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso resources/images/icons/16x16/redledina...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso resources/images/icons/16x16/redledina... |
|
Date: |
Tue, 17 Apr 2007 19:56:47 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/04/17 19:56:46
Modified files:
resources/images/icons/16x16: redledinactive.png
src/commands : CommandGroup.cpp CommandGroup.h
PlayHeadMove.cpp WorkCursorMove.cpp
src/core : AudioClip.cpp AudioClip.h Curve.h DiskIO.cpp
DiskIO.h FileHelpers.cpp MonoReader.cpp
Peak.cpp Project.cpp RingBuffer.cpp Track.cpp
WriteSource.cpp WriteSource.h
src/engine : AudioDeviceThread.cpp defines.h
src/traverso : CorrelationMeterWidget.cpp Interface.cpp
Main.cpp QuickDriverConfigWidget.cpp
SpectralMeterWidget.cpp Traverso.cpp
src/traverso/dialogs/settings: Pages.cpp
src/traverso/songcanvas: CurveView.cpp TrackView.cpp
src/traverso/widgets: InfoWidgets.cpp
. : TODO
Log message:
* some code cleanups, memory leak fixes
* changed buffer size for write sources to 5 seconds, fixed related
code that detects write buffer status.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/images/icons/16x16/redledinactive.png?cvsroot=traverso&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/CommandGroup.cpp?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/CommandGroup.h?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/PlayHeadMove.cpp?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/WorkCursorMove.cpp?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.h?cvsroot=traverso&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Curve.h?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/DiskIO.cpp?cvsroot=traverso&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/DiskIO.h?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/FileHelpers.cpp?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/MonoReader.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.cpp?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.cpp?cvsroot=traverso&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/RingBuffer.cpp?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Track.cpp?cvsroot=traverso&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/WriteSource.cpp?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/WriteSource.h?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/AudioDeviceThread.cpp?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/defines.h?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CorrelationMeterWidget.cpp?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Main.cpp?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/QuickDriverConfigWidget.cpp?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/SpectralMeterWidget.cpp?cvsroot=traverso&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Traverso.cpp?cvsroot=traverso&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveView.cpp?cvsroot=traverso&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackView.cpp?cvsroot=traverso&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/TODO?cvsroot=traverso&r1=1.3&r2=1.4
Patches:
Index: resources/images/icons/16x16/redledinactive.png
===================================================================
RCS file:
/sources/traverso/traverso/resources/images/icons/16x16/redledinactive.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Binary files /tmp/cvs4fkfXH and /tmp/cvs03h8uq differ
Index: src/commands/CommandGroup.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/CommandGroup.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/commands/CommandGroup.cpp 4 Apr 2007 09:17:30 -0000 1.4
+++ src/commands/CommandGroup.cpp 17 Apr 2007 19:56:45 -0000 1.5
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: CommandGroup.cpp,v 1.4 2007/04/04 09:17:30 r_sijrier Exp $
+$Id: CommandGroup.cpp,v 1.5 2007/04/17 19:56:45 r_sijrier Exp $
*/
#include "CommandGroup.h"
@@ -33,6 +33,13 @@
*/
+CommandGroup::~ CommandGroup()
+{
+ foreach(Command* cmd, m_commands) {
+ delete cmd;
+ }
+}
+
int CommandGroup::prepare_actions()
{
if (m_commands.size() == 0) {
@@ -66,6 +73,3 @@
// eof
-
-
-
Index: src/commands/CommandGroup.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/CommandGroup.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/commands/CommandGroup.h 24 Jan 2007 21:16:11 -0000 1.3
+++ src/commands/CommandGroup.h 17 Apr 2007 19:56:45 -0000 1.4
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- $Id: CommandGroup.h,v 1.3 2007/01/24 21:16:11 r_sijrier Exp $
+ $Id: CommandGroup.h,v 1.4 2007/04/17 19:56:45 r_sijrier Exp $
*/
#ifndef COMMAND_GROUP_H
@@ -35,7 +35,7 @@
{
m_isHistorable = historable;
};
- ~CommandGroup() {};
+ ~CommandGroup();
int prepare_actions();
int do_action();
Index: src/commands/PlayHeadMove.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/PlayHeadMove.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/commands/PlayHeadMove.cpp 13 Apr 2007 11:12:30 -0000 1.2
+++ src/commands/PlayHeadMove.cpp 17 Apr 2007 19:56:45 -0000 1.3
@@ -92,7 +92,7 @@
cpointer().get_viewport()->set_holdcursor_text(frame_to_smpte(newpos,
m_song->get_rate()));
// Hmm, the alignment of the holdcursor isn't in the center, so we have
to
// substract half the width of it to make it appear centered... :-(
-
cpointer().get_viewport()->set_holdcursor_pos(QPoint(cpointer().scene_x() - 16,
cpointer().scene_y()));
+
cpointer().get_viewport()->set_holdcursor_pos(QPoint(cpointer().scene_x() - 16,
cpointer().scene_y() - 16));
return 1;
}
Index: src/commands/WorkCursorMove.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/WorkCursorMove.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/commands/WorkCursorMove.cpp 13 Apr 2007 11:12:30 -0000 1.2
+++ src/commands/WorkCursorMove.cpp 17 Apr 2007 19:56:45 -0000 1.3
@@ -99,7 +99,7 @@
cpointer().get_viewport()->set_holdcursor_text(frame_to_smpte(newFrame,
m_song->get_rate()));
// Hmm, the alignment of the holdcursor isn't in the center, so we have
to
// substract half the width of it to make it appear centered... :-(
-
cpointer().get_viewport()->set_holdcursor_pos(QPoint(cpointer().scene_x() - 16,
cpointer().scene_y()));
+
cpointer().get_viewport()->set_holdcursor_pos(QPoint(cpointer().scene_x() - 16,
cpointer().scene_y() - 16));
return 1;
}
Index: src/core/AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- src/core/AudioClip.cpp 16 Apr 2007 18:44:26 -0000 1.76
+++ src/core/AudioClip.cpp 17 Apr 2007 19:56:45 -0000 1.77
@@ -478,7 +478,7 @@
nframes_t written = source->rb_write(captureBus->get_buffer(channel,
nframes), nframes);
if (written != nframes) {
- PWARN("couldn't write nframes to buffer, only %d", written);
+ printf("couldn't write nframes %d to recording buffer, only
%d\n", nframes, written);
}
}
@@ -519,31 +519,31 @@
channelnumber = chan;
}
- ExportSpecification* spec = new ExportSpecification;
+ m_exportSpec = new ExportSpecification;
- spec->exportdir = pm().get_project()->get_root_dir() +
"/audiosources/";
- spec->format = SF_FORMAT_WAV;
- spec->data_width = 1; // 1 means float
- spec->format |= SF_FORMAT_FLOAT;
- spec->channels = 1;
- spec->sample_rate = audiodevice().get_sample_rate();
- spec->src_quality = SRC_SINC_MEDIUM_QUALITY;
- spec->isRecording = true;
- spec->start_frame = 0;
- spec->end_frame = 0;
- spec->total_frames = 0;
- spec->blocksize = audiodevice().get_buffer_size();
+ m_exportSpec->exportdir = pm().get_project()->get_root_dir() +
"/audiosources/";
+ m_exportSpec->format = SF_FORMAT_WAV;
+ m_exportSpec->data_width = 1; // 1 means float
+ m_exportSpec->format |= SF_FORMAT_FLOAT;
+ m_exportSpec->channels = 1;
+ m_exportSpec->sample_rate = audiodevice().get_sample_rate();
+ m_exportSpec->src_quality = SRC_SINC_MEDIUM_QUALITY;
+ m_exportSpec->isRecording = true;
+ m_exportSpec->start_frame = 0;
+ m_exportSpec->end_frame = 0;
+ m_exportSpec->total_frames = 0;
+ m_exportSpec->blocksize = audiodevice().get_buffer_size();
QString songid = QString::number(m_song->get_id()) + "_";
if (m_song->get_id() < 10)
songid.prepend("0");
songid.prepend( "Song" );
- spec->name = songid + m_name;
+ m_exportSpec->name = songid + m_name;
- spec->dataF = captureBus->get_buffer( chan,
audiodevice().get_buffer_size());
+ m_exportSpec->dataF = captureBus->get_buffer( chan,
audiodevice().get_buffer_size());
- WriteSource* ws = new WriteSource(spec, channelnumber,
channelcount);
+ WriteSource* ws = new WriteSource(m_exportSpec, channelnumber,
channelcount);
ws->set_process_peaks( true );
ws->set_recording( true );
@@ -669,6 +669,8 @@
if (writeSources.isEmpty()) {
+ delete m_exportSpec;
+
int channelCount = (m_track->capture_left_channel() &&
m_track->capture_right_channel()) ? 2 : 1;
ReadSource* rs;
Index: src/core/AudioClip.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- src/core/AudioClip.h 16 Apr 2007 18:44:26 -0000 1.40
+++ src/core/AudioClip.h 17 Apr 2007 19:56:45 -0000 1.41
@@ -17,7 +17,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: AudioClip.h,v 1.40 2007/04/16 18:44:26 r_sijrier Exp $
*/
#ifndef AUDIOCLIP_H
@@ -42,6 +41,7 @@
class AudioBus;
class FadeCurve;
class Curve;
+struct ExportSpecification;
class AudioClip : public ContextItem, public Snappable
{
@@ -140,6 +140,7 @@
FadeCurve* fadeIn;
FadeCurve* fadeOut;
Curve* m_gainEnvelope;
+ ExportSpecification* m_exportSpec;
QString m_name;
nframes_t trackStartFrame;
Index: src/core/Curve.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Curve.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/core/Curve.h 16 Apr 2007 18:44:26 -0000 1.19
+++ src/core/Curve.h 17 Apr 2007 19:56:46 -0000 1.20
@@ -71,6 +71,10 @@
return left->get_when() < right->get_when();
}
+ // The 'GUI' curvenodes have double ownership, so get deleted twice
+ // to avoid this, use this function to not let this happen...
+ void clear_curve() {m_nodes.clear();}
+
protected:
struct LookupCache {
double left; /* leftmost x coordinate used when finding
"range" */
Index: src/core/DiskIO.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/DiskIO.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- src/core/DiskIO.cpp 4 Apr 2007 10:08:44 -0000 1.33
+++ src/core/DiskIO.cpp 17 Apr 2007 19:56:46 -0000 1.34
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2006 Remon Sijrier
+Copyright (C) 2006-2007 Remon Sijrier
This file is part of Traverso
@@ -17,14 +17,13 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: DiskIO.cpp,v 1.33 2007/04/04 10:08:44 r_sijrier Exp $
*/
#include "DiskIO.h"
#include "Song.h"
#include <QThread>
-#if defined (LINUX_BUILD)
+#if defined (Q_WS_X11)
#include <unistd.h>
#include <sys/syscall.h>
@@ -67,7 +66,7 @@
#define IOPRIO_CLASS_SHIFT 13
#define IOPRIO_PRIO_MASK 0xff
-#endif // endif LINUX_BUILD
+#endif // endif Q_WS_X11
#include "AudioSource.h"
#include "ReadSource.h"
@@ -95,7 +94,7 @@
: QThread(diskio),
m_diskio(diskio)
{
-#ifndef MAC_OS_BUILD
+#ifndef Q_WS_MAC
// setStackSize(20000);
#endif
}
@@ -105,7 +104,7 @@
protected:
void run()
{
-#if defined (LINUX_BUILD)
+#if defined (Q_WS_X11)
if (IOPRIO_SUPPORT) {
// When using the cfq scheduler we are able to set the priority of the io for
what it's worth though :-)
int ioprio = 0, ioprio_class = IOPRIO_CLASS_RT;
@@ -150,10 +149,8 @@
m_readBufferFillStatus = 0;
m_hardDiskOverLoadCounter = 0;
- m_minBufStatus = (audiodevice().get_sample_rate() * 12) / 1000 + 1024;
-
- m_bufferSize = (int) (config().get_property("Hardware",
"PreBufferSize", 1.0).toDouble() * audiodevice().get_sample_rate());
- framebuffer = new audio_sample_t[m_bufferSize];
+ // TODO This is a LARGE buffer, any ideas how to make it smaller ??
+ framebuffer = new audio_sample_t[audiodevice().get_sample_rate() *
writebuffertime];
// Move this instance to the workthread
moveToThread(m_diskThread);
@@ -169,7 +166,7 @@
PENTERDES;
stop();
delete cpuTimeBuffer;
- delete framebuffer;
+ delete [] framebuffer;
}
/**
@@ -250,13 +247,13 @@
for (int j=0; j<m_writeSources.size(); ++j) {
WriteSource* source = m_writeSources.at(j);
int space = source->get_processable_buffer_space();
- int prio = space / get_chunk_size();
+ int prio = (int) (space / source->get_chunck_size());
// If the source stopped recording, it will write it's
remaining samples in the next
// process_buffers call, and unregister itself from
this DiskIO instance!
if ( (prio > i) || ( ! source->is_recording()) ) {
- if ((m_bufferSize - space) < m_minBufStatus) {
+ if ((source->get_buffer_size() - space) < 8192)
{
if (! m_hardDiskOverLoadCounter++) {
emit writeSourceBufferOverRun();
}
@@ -456,7 +453,8 @@
int DiskIO::get_write_buffers_fill_status( )
{
int space = g_atomic_int_get(&m_writeBufferFillStatus);
- int status = (int) (((float)(m_bufferSize - space) / m_bufferSize) *
100);
+ int size = audiodevice().get_sample_rate() * writebuffertime;
+ int status = (int) (((float)(size - space) / size) * 100);
g_atomic_int_set(&m_writeBufferFillStatus, 0);
return status;
Index: src/core/DiskIO.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/DiskIO.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/core/DiskIO.h 4 Apr 2007 10:08:44 -0000 1.14
+++ src/core/DiskIO.h 17 Apr 2007 19:56:46 -0000 1.15
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2006 Remon Sijrier
+Copyright (C) 2006-2007 Remon Sijrier
This file is part of Traverso
@@ -17,7 +17,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: DiskIO.h,v 1.14 2007/04/04 10:08:44 r_sijrier Exp $
*/
#ifndef DISKIO_H
@@ -56,6 +55,9 @@
DiskIO(Song* song);
~DiskIO();
+ static const int writebuffertime = 5;
+ static const int bufferdividefactor = 8;
+
void prepare_for_seek();
void register_read_source(ReadSource* source);
@@ -67,8 +69,6 @@
trav_time_t get_cpu_time();
int get_write_buffers_fill_status();
int get_read_buffers_fill_status();
- int get_buffer_size() const;
- int get_chunk_size() const;
private:
Song* m_song;
@@ -82,8 +82,6 @@
QMutex mutex;
gint m_readBufferFillStatus;
gint m_writeBufferFillStatus;
- int m_bufferSize;
- int m_minBufStatus;
RingBuffer* cpuTimeBuffer;
trav_time_t cycleStartTime;
trav_time_t lastCpuReadTime;
@@ -114,16 +112,6 @@
};
-inline int DiskIO::get_buffer_size() const
-{
- return m_bufferSize;
-}
-
-inline int DiskIO::get_chunk_size() const
-{
- return m_bufferSize / 8;
-}
-
#endif
//eof
Index: src/core/FileHelpers.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/FileHelpers.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/core/FileHelpers.cpp 4 Apr 2007 00:46:38 -0000 1.7
+++ src/core/FileHelpers.cpp 17 Apr 2007 19:56:46 -0000 1.8
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: FileHelpers.cpp,v 1.7 2007/04/04 00:46:38 r_sijrier Exp $
+$Id: FileHelpers.cpp,v 1.8 2007/04/17 19:56:46 r_sijrier Exp $
*/
#include "FileHelpers.h"
@@ -87,7 +87,7 @@
int FileHelper::copy_recursively(const QString& pNameFrom, const QString&
pNameTo)
{
-#if defined (LINUX_BUILD) || defined (MAC_OS_BUILD)
+#if defined (Q_WS_X11) || defined (Q_WS_MAC)
QString nameFrom = config().get_property("Project", "directory",
"/directory/unknown").toString();
QString nameTo(nameFrom);
Index: src/core/MonoReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/MonoReader.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/core/MonoReader.cpp 23 Mar 2007 13:09:33 -0000 1.1
+++ src/core/MonoReader.cpp 17 Apr 2007 19:56:46 -0000 1.2
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: MonoReader.cpp,v 1.1 2007/03/23 13:09:33 r_sijrier Exp $
+$Id: MonoReader.cpp,v 1.2 2007/04/17 19:56:46 r_sijrier Exp $
*/
@@ -398,9 +398,9 @@
m_bufferSize = (int) (size * audiodevice().get_sample_rate());
if ( ! m_isCompressedFile) {
- m_chunkSize = m_bufferSize / 8;
+ m_chunkSize = m_bufferSize / DiskIO::bufferdividefactor;
} else {
- m_chunkSize = m_bufferSize / 4;
+ m_chunkSize = m_bufferSize / (DiskIO::bufferdividefactor / 2);
}
m_buffer = new RingBufferNPT<float>(m_bufferSize);
Index: src/core/Peak.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- src/core/Peak.cpp 2 Apr 2007 19:09:19 -0000 1.15
+++ src/core/Peak.cpp 17 Apr 2007 19:56:46 -0000 1.16
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: Peak.cpp,v 1.15 2007/04/02 19:09:19 r_sijrier Exp $
+$Id: Peak.cpp,v 1.16 2007/04/17 19:56:46 r_sijrier Exp $
*/
#include "libtraversocore.h"
@@ -676,7 +676,7 @@
PeakBuildThread::PeakBuildThread(Peak* peak)
{
m_peak = peak;
-#ifndef MAC_OS_BUILD
+#ifndef Q_WS_MAC
// setStackSize(20000);
#endif
}
Index: src/core/Project.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/core/Project.cpp 16 Apr 2007 09:08:31 -0000 1.28
+++ src/core/Project.cpp 17 Apr 2007 19:56:46 -0000 1.29
@@ -78,6 +78,7 @@
}
delete m_asmanager;
+ delete m_hs;
}
Index: src/core/RingBuffer.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/RingBuffer.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/core/RingBuffer.cpp 2 Oct 2006 19:06:57 -0000 1.5
+++ src/core/RingBuffer.cpp 17 Apr 2007 19:56:46 -0000 1.6
@@ -29,9 +29,9 @@
#include <string.h>
#ifdef USE_MLOCK
-#ifdef MAC_OS_BUILD
+#ifdef Q_WS_MAC
#include <sys/types.h>
-#endif /* MAC_OS_BUILD */
+#endif /* Q_WS_MAC */
#include <sys/mman.h>
#endif /* USE_MLOCK */
Index: src/core/Track.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Track.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- src/core/Track.cpp 12 Apr 2007 15:30:59 -0000 1.49
+++ src/core/Track.cpp 17 Apr 2007 19:56:46 -0000 1.50
@@ -302,9 +302,12 @@
Command* Track::init_recording()
{
PENTER2;
- if (isArmed) {
- QByteArray name = "Audio-" +
QByteArray::number(m_song->get_track_index(m_id)) +
- "-take-" + QByteArray::number(++numtakes);
+ if ( ! isArmed) {
+ return 0;
+ }
+
+ QString name = "Audio-" +
QString::number(m_song->get_track_index(m_id)) +
+ "-take-" + QString::number(++numtakes);
AudioClip* clip = resources_manager()->new_audio_clip(name);
clip->set_song(m_song);
@@ -317,7 +320,6 @@
} else {
return add_clip( clip );
}
- }
return 0;
}
Index: src/core/WriteSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/WriteSource.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/core/WriteSource.cpp 2 Apr 2007 09:52:31 -0000 1.16
+++ src/core/WriteSource.cpp 17 Apr 2007 19:56:46 -0000 1.17
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: WriteSource.cpp,v 1.16 2007/04/02 09:52:31 r_sijrier Exp $
+$Id: WriteSource.cpp,v 1.17 2007/04/17 19:56:46 r_sijrier Exp $
*/
#include "WriteSource.h"
@@ -40,6 +40,7 @@
, spec(specification)
{
diskio = 0;
+ m_buffer = 0;
prepare_export(spec);
}
@@ -49,6 +50,7 @@
m_channelNumber(channelNumber)
{
diskio = 0;
+ m_buffer = 0;
m_channelCount = superChannelCount;
prepare_export(spec);
}
@@ -56,8 +58,13 @@
WriteSource::~WriteSource()
{
PENTERDES;
- if (m_peak)
+ if (m_peak) {
delete m_peak;
+ }
+
+ if (m_buffer) {
+ delete m_buffer;
+ }
//FIXME spec can be owned by someone else!!!! (ExportWidget for example)
/* if (spec) {
@@ -87,8 +94,6 @@
if (sample_rate != (uint)spec->sample_rate) {
-#if defined (LINUX_BUILD) || defined (MAC_OS_BUILD)
-
int err;
src_data.output_frames = out_samples_max / channels;
@@ -144,7 +149,6 @@
float_buffer = dataF2;
-#endif
} else {
/* no SRC, keep it simple */
@@ -231,7 +235,7 @@
if ((nframes_t) written != to_write) {
sf_error_str (sf, errbuf, sizeof (errbuf) - 1);
- PWARN(("Export: could not write data to output file
(%s)"), errbuf);
+ printf(("Export: could not write data to output file
(%s)\n"), errbuf);
return -1;
}
@@ -258,9 +262,7 @@
dataF2 = leftoverF = 0;
dither = 0;
output_data = 0;
-#if defined (LINUX_BUILD) || defined (MAC_OS_BUILD)
src_state = 0;
-#endif
switch (spec->data_width) {
@@ -308,7 +310,6 @@
if ((uint)spec->sample_rate != sample_rate) {
-#if defined (LINUX_BUILD) || defined (MAC_OS_BUILD)
qDebug("Doing samplerate conversion");
int err;
@@ -324,7 +325,6 @@
max_leftover_frames = 4 * spec->blocksize;
leftoverF = new audio_sample_t[max_leftover_frames * channels];
leftover_frames = 0;
-#endif
} else {
out_samples_max = spec->blocksize * channels;
}
@@ -384,12 +384,10 @@
output_data = 0;
}
-#if defined (LINUX_BUILD) || defined (MAC_OS_BUILD)
if (src_state) {
src_delete (src_state);
src_state = 0;
}
-#endif
/* if (processPeaks) {
m_peak->finish_processing();
@@ -420,6 +418,8 @@
return;
}
+ Q_ASSERT(!m_peak);
+
m_peak = new Peak(this, m_channelNumber);
if (m_peak->prepare_processing() < 0) {
@@ -461,31 +461,14 @@
return;
}
- // calculate the 'chunk' size
- int chunkSize = diskio->get_chunk_size();
-
-
- // The amount of samples to write
- int chunkCount = (int)(readSpace / chunkSize);
-
- if (chunkCount == 0) {
- return;
- }
-
- int toWrite = chunkCount * chunkSize;
-
- // Only write to hard disk if there is at least chunkSize of data
- // to write. This makes writing much more efficient
- if (toWrite >= (chunkSize*2)) {
- toWrite = chunkSize * 2;
- }
-
- rb_file_write(toWrite);
+ rb_file_write(readSpace);
}
void WriteSource::prepare_buffer( )
{
- m_buffer = new RingBufferNPT<audio_sample_t>(diskio->get_buffer_size());
+ m_buffersize = sample_rate * DiskIO::writebuffertime;
+ m_chunksize = m_buffersize / DiskIO::bufferdividefactor;
+ m_buffer = new RingBufferNPT<audio_sample_t>(m_buffersize);
}
void WriteSource::set_diskio( DiskIO * io )
Index: src/core/WriteSource.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/WriteSource.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/core/WriteSource.h 2 Apr 2007 09:52:31 -0000 1.10
+++ src/core/WriteSource.h 17 Apr 2007 19:56:46 -0000 1.11
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: WriteSource.h,v 1.10 2007/04/02 09:52:31 r_sijrier Exp $
+$Id: WriteSource.h,v 1.11 2007/04/17 19:56:46 r_sijrier Exp $
*/
#ifndef WRITESOURCE_H
@@ -27,11 +27,7 @@
#include "RingBufferNPT.h"
#include <sndfile.h>
#include "gdither.h"
-
-
-#if defined (LINUX_BUILD) || defined (MAC_OS_BUILD)
#include <samplerate.h>
-#endif
struct ExportSpecification;
class Peak;
@@ -51,6 +47,8 @@
int rb_file_write(nframes_t cnt);
void process_ringbuffer(audio_sample_t* framebuffer, bool seek);
int get_processable_buffer_space() const;
+ int get_chunck_size() const {return m_chunksize;}
+ int get_buffer_size() const {return m_buffersize;}
int process(nframes_t nframes);
@@ -79,10 +77,8 @@
uint channels;
uint32_t sample_bytes;
nframes_t leftover_frames;
-#if defined (LINUX_BUILD) || defined (MAC_OS_BUILD)
SRC_DATA src_data;
SRC_STATE* src_state;
-#endif
nframes_t max_leftover_frames;
float* leftoverF;
float* dataF2;
@@ -90,6 +86,10 @@
bool processPeaks;
size_t m_isRecording;
int m_channelNumber;
+ int m_buffersize;
+ int m_chunksize;
+
+
signals:
void exportFinished(WriteSource* );
Index: src/engine/AudioDeviceThread.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/engine/AudioDeviceThread.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/engine/AudioDeviceThread.cpp 22 Mar 2007 02:17:13 -0000 1.14
+++ src/engine/AudioDeviceThread.cpp 17 Apr 2007 19:56:46 -0000 1.15
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: AudioDeviceThread.cpp,v 1.14 2007/03/22 02:17:13 r_sijrier Exp $
+$Id: AudioDeviceThread.cpp,v 1.15 2007/04/17 19:56:46 r_sijrier Exp $
*/
#include "AudioDeviceThread.h"
@@ -26,7 +26,7 @@
#include "Driver.h"
#include <Information.h>
-#if defined (LINUX_BUILD)
+#if defined (Q_WS_X11)
#include <sys/resource.h>
#include <sched.h>
#endif
@@ -52,7 +52,7 @@
protected:
void run()
{
-#if defined (LINUX_BUILD) || defined (MAC_OS_BUILD)
+#if defined (Q_WS_X11) || defined (Q_WS_MAC)
struct sched_param param;
param.sched_priority = 90;
if (pthread_setschedparam (pthread_self(), SCHED_FIFO, ¶m)
!= 0) {}
@@ -66,7 +66,7 @@
if (guardedThread->watchdogCheck == 0) {
qCritical("WatchDog timed out!");
// guardedThread->terminate();
-#if defined (LINUX_BUILD) || defined (MAC_OS_BUILD)
+#if defined (Q_WS_X11) || defined (Q_WS_MAC)
kill (-getpgrp(), SIGABRT);
#endif
}
@@ -82,7 +82,7 @@
m_realTime = true;
setTerminationEnabled(true);
-#ifndef MAC_OS_BUILD
+#ifndef Q_WS_MAC
setStackSize(1000000);
#endif
@@ -122,7 +122,7 @@
int AudioDeviceThread::become_realtime( bool realtime )
{
m_realTime = realtime;
-#if defined (LINUX_BUILD) || defined (MAC_OS_BUILD)
+#if defined (Q_WS_X11) || defined (Q_WS_MAC)
/* RTC stuff */
if (realtime) {
@@ -148,7 +148,7 @@
void AudioDeviceThread::run_on_cpu( int cpu )
{
-#if defined (LINUX_BUILD)
+#if defined (Q_WS_X11)
cpu_set_t mask;
CPU_ZERO(&mask);
CPU_SET(cpu, &mask);
Index: src/engine/defines.h
===================================================================
RCS file: /sources/traverso/traverso/src/engine/defines.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/engine/defines.h 2 Apr 2007 09:52:31 -0000 1.3
+++ src/engine/defines.h 17 Apr 2007 19:56:46 -0000 1.4
@@ -4,13 +4,13 @@
#include <inttypes.h>
#include "FastDelegate.h"
-#if defined (WIN_BUILD)
+#if defined (Q_WS_WIN)
// 'stolen' from the glib/atomic.h header file.
// it's the only thing we need glib for on windows...
# define g_atomic_int_get(atomic) (*(atomic))
# define g_atomic_int_set(atomic, newval) ((void) (*(atomic) = (newval)))
#define gint int
-#endif // END WIN_BUILD
+#endif // END Q_WS_WIN
using namespace fastdelegate;
Index: src/traverso/CorrelationMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CorrelationMeterWidget.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/traverso/CorrelationMeterWidget.cpp 2 Apr 2007 21:05:43 -0000
1.19
+++ src/traverso/CorrelationMeterWidget.cpp 17 Apr 2007 19:56:46 -0000
1.20
@@ -137,6 +137,9 @@
CorrelationMeterView::~CorrelationMeterView()
{
+ if (m_meter) {
+ delete m_meter;
+ }
}
void CorrelationMeterView::paint(QPainter *painter, const
QStyleOptionGraphicsItem *option, QWidget *widget)
@@ -245,6 +248,7 @@
if (m_song) {
if (m_meter) {
+ // FIXME The removed plugin still needs to be
deleted!!!!!!
Command::process_command(m_song->get_plugin_chain()->remove_plugin(m_meter,
false));
timer.stop();
}
Index: src/traverso/Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- src/traverso/Interface.cpp 16 Apr 2007 18:44:26 -0000 1.65
+++ src/traverso/Interface.cpp 17 Apr 2007 19:56:46 -0000 1.66
@@ -120,16 +120,15 @@
addDockWidget(Qt::RightDockWidgetArea, historyDW);
// AudioSources View
- AudioSourcesDW = new QDockWidget(tr("AudioSources"), this);
+/* AudioSourcesDW = new QDockWidget(tr("AudioSources"), this);
AudioSourcesDW->setObjectName("AudioSourcesDockWidget");
audiosourcesview = new QTreeView(AudioSourcesDW);
audiosourcesview->setFocusPolicy(Qt::NoFocus);
-// audiosourcesview->setAnimated(true);
TreeModel* model = new TreeModel("hoi, test");
audiosourcesview->setModel(model);
AudioSourcesDW->setWidget(audiosourcesview);
addDockWidget(Qt::TopDockWidgetArea, AudioSourcesDW);
- AudioSourcesDW->hide();
+ AudioSourcesDW->hide();*/
// Meter Widgets
correlationMeterDW = new QDockWidget(tr("Correlation Meter"), this);
@@ -389,7 +388,7 @@
menu->addAction(historyDW->toggleViewAction());
menu->addAction(busMonitorDW->toggleViewAction());
- menu->addAction(AudioSourcesDW->toggleViewAction());
+// menu->addAction(AudioSourcesDW->toggleViewAction());
menu->addSeparator();
@@ -535,7 +534,7 @@
QMenu* Interface::create_context_menu(QObject* item )
{
- QMenu* menu = new QMenu();
+ QMenu* menu = new QMenu(this);
QList<MenuData > list = ie().create_menudata_for( item );
@@ -601,7 +600,7 @@
qSort(list->begin(), list->end(), MenuData::smaller);
- QMenu* sub = new QMenu();
+ QMenu* sub = new QMenu(this);
sub->setFont(QFont("Bitstream Vera Sans", 8));
QFont font("Bitstream Vera Sans", 8);
Index: src/traverso/Main.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Main.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/traverso/Main.cpp 16 Mar 2007 00:10:26 -0000 1.7
+++ src/traverso/Main.cpp 17 Apr 2007 19:56:46 -0000 1.8
@@ -17,7 +17,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA.
- $Id: Main.cpp,v 1.7 2007/03/16 00:10:26 r_sijrier Exp $
*/
#include <signal.h>
@@ -39,7 +38,7 @@
int signalcount = 0;
-#if defined (LINUX_BUILD) || defined (MAC_OS_BUILD)
+#if defined (Q_WS_X11) || defined (Q_WS_MAC)
void catch_signal(int sig_num)
{
if (!signalcount) {
@@ -63,7 +62,7 @@
TRACE_OFF();
MEM_ON();
-#if defined (LINUX_BUILD) || defined (MAC_OS_BUILD)
+#if defined (Q_WS_X11) || defined (Q_WS_MAC)
signal(SIGINT, catch_signal);
signal(SIGSEGV, catch_signal);
#endif
@@ -91,23 +90,9 @@
printf("\t--d3 \t\t Set debug level to 3
(SUPER_FLOOD)\n");
printf("\t--d4 \t\t Set debug level to 4
(ALL)\n");
printf("\t--log \t\t Create a ~/traverso.log
file instead of dumping debug messages to stdout\n");
-// printf("\t--scanbuses \t List all hardware in
and out buses\n");
printf("\n");
return 0;
}
- if ((strcmp(argv[i],"--scanbuses")==0) ||
(strcmp(argv[i],"-h")==0)) {
- return 0;
- }
- if (strcmp(argv[i],"--render")==0) {
- printf("Render in batch mode is being
implemented.\n");
- // TODO
- return 0;
- }
- if (strcmp(argv[i],"--renderwav")==0) {
- printf("Render in batch mode is being
implemented.\n");
- // TODO
- return 0;
- }
if (strcmp(argv[i],"--memtrace")==0)
TRACE_ON();
if (strcmp(argv[i],"-v")==0) {
Index: src/traverso/QuickDriverConfigWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/QuickDriverConfigWidget.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/traverso/QuickDriverConfigWidget.cpp 3 Apr 2007 21:25:25 -0000
1.7
+++ src/traverso/QuickDriverConfigWidget.cpp 17 Apr 2007 19:56:46 -0000
1.8
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: QuickDriverConfigWidget.cpp,v 1.7 2007/04/03 21:25:25 benjie Exp $
+$Id: QuickDriverConfigWidget.cpp,v 1.8 2007/04/17 19:56:46 r_sijrier Exp $
*/
#include "QuickDriverConfigWidget.h"
@@ -76,11 +76,11 @@
#if defined (PORTAUDIO_SUPPORT)
if (driver == "PortAudio") {
-#if defined (LINUX_BUILD)
+#if defined (Q_WS_X11)
cardDevice = config().get_property("Hardware", "pahostapi",
"alsa").toString();
-#elif defined (MAC_OS_BUILD)
+#elif defined (Q_WS_MAC)
cardDevice = config().get_property("Hardware", "pahostapi",
"coreaudio").toString();
-#elif defined (WIN_BUILD)
+#elif defined (Q_WS_WIN)
cardDevice = config().get_property("Hardware", "pahostapi",
"wmme").toString();
#endif
}
Index: src/traverso/SpectralMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/SpectralMeterWidget.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- src/traverso/SpectralMeterWidget.cpp 7 Apr 2007 15:20:25 -0000
1.37
+++ src/traverso/SpectralMeterWidget.cpp 17 Apr 2007 19:56:46 -0000
1.38
@@ -156,7 +156,9 @@
SpectralMeterView::~SpectralMeterView()
{
-// delete m_config;
+ if (m_meter) {
+ delete m_meter;
+ }
}
void SpectralMeterView::paint(QPainter *painter, const
QStyleOptionGraphicsItem *option, QWidget *widget)
@@ -332,6 +334,7 @@
if (m_song) {
if (m_meter) {
+ // FIXME The removed plugin still needs to be
deleted!!!!!!
Command::process_command(m_song->get_plugin_chain()->remove_plugin(m_meter,
false));
timer.stop();
}
Index: src/traverso/Traverso.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Traverso.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- src/traverso/Traverso.cpp 16 Apr 2007 18:44:26 -0000 1.34
+++ src/traverso/Traverso.cpp 17 Apr 2007 19:56:46 -0000 1.35
@@ -106,6 +106,7 @@
{
PENTERDES;
delete Interface::instance();
+ delete themer();
}
@@ -217,11 +218,11 @@
#if defined (PORTAUDIO_SUPPORT)
if (driverType == "PortAudio") {
-#if defined (LINUX_BUILD)
+#if defined (Q_WS_X11)
cardDevice = config().get_property("Hardware", "pahostapi",
"alsa").toString();
-#elif defined (MAC_OS_BUILD)
+#elif defined (Q_WS_MAC)
cardDevice = config().get_property("Hardware", "pahostapi",
"coreaudio").toString();
-#elif defined (WIN_BUILD)
+#elif defined (Q_WS_WIN)
cardDevice = config().get_property("Hardware", "pahostapi",
"wmme").toString();
#endif
}
Index: src/traverso/dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/traverso/dialogs/settings/Pages.cpp 16 Apr 2007 18:44:26 -0000
1.11
+++ src/traverso/dialogs/settings/Pages.cpp 17 Apr 2007 19:56:46 -0000
1.12
@@ -149,10 +149,10 @@
#endif
#if defined (PORTAUDIO_SUPPORT)
-#if defined (LINUX_BUILD)
+#if defined (Q_WS_X11)
config().set_property("Hardware", "pahostapi", "alsa");
#endif
-#if defined (MAC_OS_BUILD)
+#if defined (Q_WS_MAC)
config().set_property("Hardware", "pahostapi", "coreaudio");
#endif
#if defined (Q_WS_WIN)
@@ -225,14 +225,14 @@
m_portaudiodrivers->driverCombo->clear();
QString defaulthostapi = "";
-#if defined (LINUX_BUILD)
+#if defined (Q_WS_X11)
m_portaudiodrivers->driverCombo->addItem("ALSA", "alsa");
m_portaudiodrivers->driverCombo->addItem("Jack", "jack");
m_portaudiodrivers->driverCombo->addItem("OSS", "oss");
defaulthostapi = "jack";
#endif
-#if defined (MAC_OS_BUILD)
+#if defined (Q_WS_MAC)
m_portaudiodrivers->driverCombo->addItem("Core Audio", "coreaudio");
m_portaudiodrivers->driverCombo->addItem("Jack", "jack");
defaulthostapi = "coreaudio";
Index: src/traverso/songcanvas/CurveView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveView.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/traverso/songcanvas/CurveView.cpp 16 Apr 2007 09:08:31 -0000
1.28
+++ src/traverso/songcanvas/CurveView.cpp 17 Apr 2007 19:56:46 -0000
1.29
@@ -17,7 +17,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: CurveView.cpp,v 1.28 2007/04/16 09:08:31 r_sijrier Exp $
*/
#include "CurveView.h"
@@ -192,6 +191,8 @@
CurveView::~ CurveView( )
{
+ m_guicurve->clear_curve();
+ delete m_guicurve;
}
static bool smallerpoint(const QPointF& left, const QPointF& right) {
Index: src/traverso/songcanvas/TrackView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TrackView.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- src/traverso/songcanvas/TrackView.cpp 17 Apr 2007 11:51:20 -0000
1.27
+++ src/traverso/songcanvas/TrackView.cpp 17 Apr 2007 19:56:46 -0000
1.28
@@ -113,8 +113,6 @@
PENTER;
foreach(AudioClipView* view, m_clipViews) {
if (view->get_clip() == clip) {
- printf("Removing clipview for clip %lld\n",
clip->get_id());
- scene()->removeItem(view);
m_clipViews.removeAll(view);
delete view;
return;
Index: src/traverso/widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/traverso/widgets/InfoWidgets.cpp 13 Apr 2007 11:12:30 -0000
1.14
+++ src/traverso/widgets/InfoWidgets.cpp 17 Apr 2007 19:56:46 -0000
1.15
@@ -110,7 +110,7 @@
foreach(Song* song, m_project->get_songs() ) {
bufReadStatus =
std::min(song->get_diskio()->get_read_buffers_fill_status(), bufReadStatus);
bufWriteStatus =
std::min(song->get_diskio()->get_write_buffers_fill_status(), bufWriteStatus);
- // time += song->get_diskio()->get_cpu_time();
+ time += song->get_diskio()->get_cpu_time();
}
}
@@ -144,7 +144,6 @@
lay->setMargin(0);
setLayout(lay);
-// setFrameStyle(QFrame::StyledPanel);
setFrameStyle(QFrame::NoFrame);
connect(&audiodevice(), SIGNAL(driverParamsChanged()), this,
SLOT(update_driver_info()));
@@ -499,11 +498,6 @@
, m_song(0)
, m_project(0)
{
-/* QPalette pallet;
- pallet.setColor(QPalette::Background, QColor("#FFF4FF"));
- setPalette(pallet);
- setAutoFillBackground(true);*/
-
setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
connect(&pm(), SIGNAL(projectLoaded(Project*)), this,
SLOT(set_project(Project*)));
Index: TODO
===================================================================
RCS file: /sources/traverso/traverso/TODO,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- TODO 4 Apr 2007 00:30:12 -0000 1.3
+++ TODO 17 Apr 2007 19:56:46 -0000 1.4
@@ -1,5 +1,11 @@
TOBEDONE FOR 0.40.0
+* Curves should have a default (first) node which is not allowed to be
removed, or moved horiztonally!!!
+
+* sometimes the project file seems to be filled from within a loop, perhaps
this is due
+ some action is still in the tsar event queue being processed by the rt
thread, while
+ at the same time, the gui thread starts the save routine, just guessing here
though..
+
* Audible glitch when playing over a split point in a splitted audioclip :-(
:-( :-(
* I got a reproducable crash when adding a new track and importing an audio