summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2011-02-09 21:06:57 +0000
committerRobert Jonsson <spamatica@gmail.com>2011-02-09 21:06:57 +0000
commite11f572d97bb761d848fad41991d0ed747bad111 (patch)
tree61f8f0f831d7effcce3c0ac4d127302d6638a12b
parent2ab9bec287163d8db482d1851562d2ba6a00b5e9 (diff)
bounce
-rw-r--r--muse2/ChangeLog2
-rw-r--r--muse2/muse/app.cpp10
2 files changed, 11 insertions, 1 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 685bdec2..081649b8 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,5 @@
+09.02.2011:
+ - fixed regression with Bounce to File and Bounce to Track (rj)
08.02.2011:
- made muse compilable under gcc-4.6. ptrdiff_t type requires inclusion of cstddef. (Orcan)
31.01.2011:
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index 9760aea9..c12e5914 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -4451,11 +4451,15 @@ void MusE::bounceToTrack()
return;
}
}
+
+ song->setPos(0,song->lPos(),0,true,true);
song->bounceOutput = out;
song->bounceTrack = track;
song->setRecord(true);
song->setRecordFlag(track, true);
+ track->prepareRecording();
audio->msgBounce();
+ song->setPlay(true);
}
//---------------------------------------------------------
@@ -4473,7 +4477,7 @@ void MusE::bounceToFile(AudioOutput* ao)
if(ol->empty())
{
QMessageBox::critical(this,
- tr("MusE: Bounce to Track"),
+ tr("MusE: Bounce to File"),
tr("No audio output tracks found")
);
return;
@@ -4513,11 +4517,15 @@ void MusE::bounceToFile(AudioOutput* ao)
if (sf == 0)
return;
+ song->setPos(0,song->lPos(),0,true,true);
song->bounceOutput = ao;
ao->setRecFile(sf);
+ printf("ao->setRecFile %d\n", sf);
song->setRecord(true, false);
song->setRecordFlag(ao, true);
+ ao->prepareRecording();
audio->msgBounce();
+ song->setPlay(true);
}
#ifdef HAVE_LASH