[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/core Song.cpp Track.cpp
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src/core Song.cpp Track.cpp |
Date: |
Mon, 02 Apr 2007 20:52:36 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/04/02 20:52:36
Modified files:
src/core : Song.cpp Track.cpp
Log message:
leave tracks that failed to init recording out of the 'recording
tracks' CommandGroup
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Track.cpp?cvsroot=traverso&r1=1.43&r2=1.44
Patches:
Index: Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- Song.cpp 2 Apr 2007 19:23:06 -0000 1.69
+++ Song.cpp 2 Apr 2007 20:52:36 -0000 1.70
@@ -559,13 +559,18 @@
emit transferStarted();
if (any_track_armed()) {
- CommandGroup* group = new CommandGroup(this,
tr("Recording to Clip(s)"));
-
+ CommandGroup* group = new CommandGroup(this, "");
+ int clipcount = 0;
foreach(Track* track, m_tracks) {
if (track->armed()) {
-
group->add_command(track->init_recording());
+ Command* cmd = track->init_recording();
+ if (cmd) {
+ group->add_command(cmd);
+ clipcount++;
+ }
}
}
+ group->setText(tr("Recording to %n Clip(s)", "",
clipcount));
ie().process_command(group);
}
Index: Track.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Track.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- Track.cpp 29 Mar 2007 11:09:38 -0000 1.43
+++ Track.cpp 2 Apr 2007 20:52:36 -0000 1.44
@@ -302,7 +302,7 @@
if (clip->init_recording(busIn) < 0) {
PERROR("Could not create AudioClip to record to!");
- delete clip;
+
resources_manager()->remove_clip_from_database(clip->get_id());
} else {
return add_clip( clip );
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src/core Song.cpp Track.cpp,
Remon Sijrier <=