From 164c30b96d94561ba71c770eb0598d0195728615 Mon Sep 17 00:00:00 2001 From: Robert Jonsson Date: Sun, 8 Jul 2012 12:15:42 +0000 Subject: see ChangeLog --- muse2/ChangeLog | 3 + muse2/muse/arranger/arrangerview.cpp | 22 +++++-- muse2/muse/audiotrack.cpp | 15 +++-- muse2/muse/globals.cpp | 2 - muse2/muse/globals.h | 2 - muse2/muse/track.h | 1 + muse2/muse/wave.cpp | 4 +- muse2/muse/widgets/view.cpp | 1 - muse2/share/locale/muse_cs.ts | 114 +++++++++++++++++++---------------- muse2/share/locale/muse_de.ts | 14 ++++- muse2/share/locale/muse_en.ts | 114 +++++++++++++++++++---------------- muse2/share/locale/muse_es.ts | 14 ++++- muse2/share/locale/muse_fr.ts | 14 ++++- muse2/share/locale/muse_pl.ts | 14 ++++- muse2/share/locale/muse_ru.ts | 8 +++ muse2/share/locale/muse_sv_SE.ts | 8 +++ 16 files changed, 219 insertions(+), 131 deletions(-) diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 12fae57e..bd96a2c0 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,4 +1,7 @@ 08.07.2012: + - Changed naming convention for recorded wave files to include track name and it's + take number. (rj) + - added a warning dialog for the delete track key shortcut. (rj) - Use cmake's own FindPythonLibs module instead of pkgconfig to detect Python (Orcan) 06.07.2012: - Updated Czech translation from Pavel Fric (rj) diff --git a/muse2/muse/arranger/arrangerview.cpp b/muse2/muse/arranger/arrangerview.cpp index 57c12d15..9c24c7ce 100644 --- a/muse2/muse/arranger/arrangerview.cpp +++ b/muse2/muse/arranger/arrangerview.cpp @@ -492,19 +492,29 @@ void ArrangerView::cmd(int cmd) arranger->cmd(Arranger::CMD_INSERT_EMPTYMEAS); break; case CMD_DELETE: - if (!MusEGlobal::song->msgRemoveParts()) //automatically does undo if neccessary and returns true then { - //msgRemoveParts() returned false -> no parts to remove? - MusEGlobal::song->startUndo(); - MusEGlobal::audio->msgRemoveTracks(); //TODO FINDME this could still be speeded up! - MusEGlobal::song->endUndo(SC_TRACK_REMOVED); + QMessageBox::StandardButton btn = QMessageBox::warning( + this,tr("Remove track(s)"),tr("Are you sure you want to remove this track(s)?"), + QMessageBox::Ok|QMessageBox::Cancel, QMessageBox::Ok); + + if (btn == QMessageBox::Cancel) + break; + if (!MusEGlobal::song->msgRemoveParts()) //automatically does undo if neccessary and returns true then + { + //msgRemoveParts() returned false -> no parts to remove? + MusEGlobal::song->startUndo(); + MusEGlobal::audio->msgRemoveTracks(); //TODO FINDME this could still be speeded up! + MusEGlobal::song->endUndo(SC_TRACK_REMOVED); + } } break; - case CMD_DELETE_TRACK: + case CMD_DELETE_TRACK: // from menu + { MusEGlobal::song->startUndo(); MusEGlobal::audio->msgRemoveTracks(); MusEGlobal::song->endUndo(SC_TRACK_REMOVED); MusEGlobal::audio->msgUpdateSoloStates(); + } break; case CMD_DUPLICATE_TRACK: diff --git a/muse2/muse/audiotrack.cpp b/muse2/muse/audiotrack.cpp index dac496d7..32922c3b 100644 --- a/muse2/muse/audiotrack.cpp +++ b/muse2/muse/audiotrack.cpp @@ -102,6 +102,7 @@ AudioTrack::AudioTrack(TrackType t) _sendMetronome = false; _prefader = false; _efxPipe = new Pipeline(); + recFileNumber = 1; //_recFile = 0; //unneeded, _recFile's ctor does this _channels = 0; _automationType = AUTO_OFF; @@ -130,7 +131,8 @@ AudioTrack::AudioTrack(const AudioTrack& t, int flags) _processed = false; _haveData = false; _efxPipe = new Pipeline(); // Start off with a new pipeline. - + recFileNumber = 1; + // Don't allocate outBuffers here. Let internal_assign() call setTotalOutChannels to set them up. outBuffers = 0; _totalOutChannels = 0; @@ -1881,10 +1883,11 @@ bool AudioTrack::prepareRecording() // char buffer[128]; QFile fil; - for (;;++MusEGlobal::recFileNumber) { - sprintf(buffer, "%s/rec%d.wav", - MusEGlobal::museProject.toLatin1().constData(), - MusEGlobal::recFileNumber); + for (;;++recFileNumber) { + sprintf(buffer, "%s/TRACK_%s_TAKE_%d.wav", + MusEGlobal::museProject.toLocal8Bit().constData(), + name().simplified().replace(" ","_").toLocal8Bit().constData(), + recFileNumber); fil.setFileName(QString(buffer)); if (!fil.exists()) break; @@ -1896,7 +1899,7 @@ bool AudioTrack::prepareRecording() } if (MusEGlobal::debugMsg) - printf("AudioNode::setRecordFlag1: init internal file %s\n", _recFile->path().toLatin1().constData()); + printf("AudioNode::setRecordFlag1: init internal file %s\n", _recFile->path().toLatin1().constData()); if(_recFile->openWrite()) { diff --git a/muse2/muse/globals.cpp b/muse2/muse/globals.cpp index b3765074..967f0870 100644 --- a/muse2/muse/globals.cpp +++ b/muse2/muse/globals.cpp @@ -35,8 +35,6 @@ namespace MusEGlobal { -int recFileNumber = 1; - int sampleRate = 44100; unsigned segmentSize = 1024U; // segmentSize in frames (set by JACK) unsigned fifoLength = 128; // 131072/segmentSize diff --git a/muse2/muse/globals.h b/muse2/muse/globals.h index bdf383c8..915486e1 100644 --- a/muse2/muse/globals.h +++ b/muse2/muse/globals.h @@ -44,8 +44,6 @@ namespace MusEGlobal { extern const float denormalBias; -extern int recFileNumber; - extern int sampleRate; extern unsigned segmentSize; extern unsigned fifoLength; // inversely proportional to segmentSize diff --git a/muse2/muse/track.h b/muse2/muse/track.h index 3da34912..3efc6912 100644 --- a/muse2/muse/track.h +++ b/muse2/muse/track.h @@ -346,6 +346,7 @@ class AudioTrack : public Track { bool _prefader; // prefader metering std::vector _auxSend; void readAuxSend(Xml& xml); + int recFileNumber; bool _sendMetronome; AutomationType _automationType; diff --git a/muse2/muse/wave.cpp b/muse2/muse/wave.cpp index 8d17a10d..0657bbe0 100644 --- a/muse2/muse/wave.cpp +++ b/muse2/muse/wave.cpp @@ -150,7 +150,7 @@ void SndFile::readCache(const QString& path, bool showProgress) for (unsigned ch = 0; ch < channels(); ++ch) cache[ch] = new SampleV[csize]; - FILE* cfile = fopen(path.toLatin1().constData(), "r"); + FILE* cfile = fopen(path.toLocal8Bit().constData(), "r"); if (cfile) { for (unsigned ch = 0; ch < channels(); ++ch) fread(cache[ch], csize * sizeof(SampleV), 1, cfile); @@ -344,7 +344,7 @@ bool SndFile::openWrite() return false; } QString p = path(); - sf = sf_open(p.toLatin1().constData(), SFM_RDWR, &sfinfo); + sf = sf_open(p.toLocal8Bit().constData(), SFM_RDWR, &sfinfo); sfUI = 0; if (sf) { openFlag = true; diff --git a/muse2/muse/widgets/view.cpp b/muse2/muse/widgets/view.cpp index 60056848..fb53be46 100644 --- a/muse2/muse/widgets/view.cpp +++ b/muse2/muse/widgets/view.cpp @@ -513,7 +513,6 @@ void View::pdraw(QPainter& p, const QRect& r) int y = r.y(); int w = r.width(); int h = r.height(); - printf("xmag=%d\n",xmag); if (xmag <= 0) { // TODO These adjustments are required, otherwise gaps. Tried, unable to remove them for now. p4.0.30 x -= 1; diff --git a/muse2/share/locale/muse_cs.ts b/muse2/share/locale/muse_cs.ts index 4c9b4a1a..a04d64a8 100644 --- a/muse2/share/locale/muse_cs.ts +++ b/muse2/share/locale/muse_cs.ts @@ -7311,18 +7311,28 @@ Klepnutí pravým tlačítkem myši pro ukázání rozhraní. Nastavit v&lastní sloupce - - + + Remove track(s) + + + + + Are you sure you want to remove this track(s)? + + + + + New Nový - + Changed Settings Nastavení změněna - + Unfortunately, the changed arranger column settings cannot be applied while MusE is running. To apply the changes, please restart MusE. Sorry. @@ -13943,174 +13953,174 @@ Robert Jonsson file_patterns - + Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2) Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2) - + Midi (*.mid *.MID *.mid.gz *.mid.bz2) Midi (*.mid *.MID *.mid.gz *.mid.bz2) - + Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2) Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2) - - - - - - - - - - - - + + + + + + + + + + + + All Files (*) Všechny soubory (*) - + Midi (*.mid) Midi (*.mid) - + Karaoke (*.kar) Karaoke (*.kar) - + all known files (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar) Všechny známé soubory (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar) - + med Files (*.med *.med.gz *.med.bz2) Soubory med (*.med *.med.gz *.med.bz2) - - - + + + Uncompressed med Files (*.med) Nestlačené soubory med (*.med) - - - + + + gzip compressed med Files (*.med.gz) Soubory med stlačené gzip (*.med.gz) - - - + + + bzip2 compressed med Files (*.med.bz2) Soubory med stlačené bzip2 (*.med.bz2) - + mid Files (*.mid *.midi *.kar *.MID *.MIDI *.KAR) Soubory mid (*.mid *.midi *.kar *.MID *.MIDI *.KAR) - + (*.jpg *.gif *.png) (*.jpg *.gif *.png) - + (*.jpg) (*.jpg) - + (*.gif) (*.gif) - + (*.png) (*.png) - + part Files (*.mpt *.mpt.gz *.mpt.bz2) Soubory part (*.mpt *.mpt.gz *.mpt.bz2) - + part Files (*.mpt) Soubory part (*.mpt) - + gzip compressed part Files (*.mpt.gz) Soubory part stlačené gzip (*.mpt.gz) - + bzip2 compressed part Files (*.mpt.bz2) Soubory part stlačené bzip2 (*.mpt.bz2) - + Presets (*.pre *.pre.gz *.pre.bz2) Přednastavení (*.pre *.pre.gz *.pre.bz2) - + Presets (*.pre) Přednastavení (*.pre) - + gzip compressed presets (*.pre.gz) Přednastavení stlačená gzip (*.pre.gz) - + bzip2 compressed presets (*.pre.bz2) Přednastavení stlačená bzip2 (*.pre.bz2) - + Presets (*.map *.map.gz *.map.bz2) Přednastavení (*.map *.map.gz *.map.bz2) - + Presets (*.map) Přednastavení (*.map) - + gzip compressed presets (*.map.gz) Přednastavení stlačená gzip (*.map.gz) - + bzip2 compressed presets (*.map.bz2) Přednastavení stlačená bzip2 (*.map.bz2) - + Wave/Binary (*.wav *.ogg *.bin) Wave/Binární (*.wav *.ogg *.bin) - + Wave (*.wav *.ogg) Wave (*.wav *.ogg) - + Binary (*.bin) Binární (*.bin) diff --git a/muse2/share/locale/muse_de.ts b/muse2/share/locale/muse_de.ts index 37f44460..66398de4 100644 --- a/muse2/share/locale/muse_de.ts +++ b/muse2/share/locale/muse_de.ts @@ -7332,7 +7332,17 @@ Rechtsklick, um die GUI zu zeigen. Benutzerdefinierte &Spalten konfigurieren - + + Remove track(s) + + + + + Are you sure you want to remove this track(s)? + + + + New Neu @@ -13961,7 +13971,7 @@ Robert Jonsson file_patterns - + Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2) Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2) diff --git a/muse2/share/locale/muse_en.ts b/muse2/share/locale/muse_en.ts index 511e6b39..699994a9 100644 --- a/muse2/share/locale/muse_en.ts +++ b/muse2/share/locale/muse_en.ts @@ -6953,18 +6953,28 @@ Right-click to show GUI. - - + + Remove track(s) + + + + + Are you sure you want to remove this track(s)? + + + + + New - + Changed Settings - + Unfortunately, the changed arranger column settings cannot be applied while MusE is running. To apply the changes, please restart MusE. Sorry. @@ -13482,174 +13492,174 @@ Robert Jonsson file_patterns - + Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2) - + Midi (*.mid *.MID *.mid.gz *.mid.bz2) - + Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2) - - - - - - - - - - - - + + + + + + + + + + + + All Files (*) - + Midi (*.mid) - + Karaoke (*.kar) - + all known files (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar) - + med Files (*.med *.med.gz *.med.bz2) - - - + + + Uncompressed med Files (*.med) - - - + + + gzip compressed med Files (*.med.gz) - - - + + + bzip2 compressed med Files (*.med.bz2) - + mid Files (*.mid *.midi *.kar *.MID *.MIDI *.KAR) - + (*.jpg *.gif *.png) - + (*.jpg) - + (*.gif) - + (*.png) - + part Files (*.mpt *.mpt.gz *.mpt.bz2) - + part Files (*.mpt) - + gzip compressed part Files (*.mpt.gz) - + bzip2 compressed part Files (*.mpt.bz2) - + Presets (*.pre *.pre.gz *.pre.bz2) - + Presets (*.pre) - + gzip compressed presets (*.pre.gz) - + bzip2 compressed presets (*.pre.bz2) - + Presets (*.map *.map.gz *.map.bz2) - + Presets (*.map) - + gzip compressed presets (*.map.gz) - + bzip2 compressed presets (*.map.bz2) - + Wave/Binary (*.wav *.ogg *.bin) - + Wave (*.wav *.ogg) - + Binary (*.bin) diff --git a/muse2/share/locale/muse_es.ts b/muse2/share/locale/muse_es.ts index aca6ab37..d3d3c41b 100644 --- a/muse2/share/locale/muse_es.ts +++ b/muse2/share/locale/muse_es.ts @@ -7278,7 +7278,17 @@ Clic derecho para ver la interfaz - + + Remove track(s) + + + + + Are you sure you want to remove this track(s)? + + + + New Nuevo @@ -13886,7 +13896,7 @@ Robert Jonsson file_patterns - + Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2) diff --git a/muse2/share/locale/muse_fr.ts b/muse2/share/locale/muse_fr.ts index 52226e8e..9b92e20e 100644 --- a/muse2/share/locale/muse_fr.ts +++ b/muse2/share/locale/muse_fr.ts @@ -7100,7 +7100,17 @@ Right-click to show GUI. - + + Remove track(s) + + + + + Are you sure you want to remove this track(s)? + + + + New Nouveau @@ -13634,7 +13644,7 @@ Robert Jonsson file_patterns - + Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2) diff --git a/muse2/share/locale/muse_pl.ts b/muse2/share/locale/muse_pl.ts index 8ee1f08c..fb882c35 100644 --- a/muse2/share/locale/muse_pl.ts +++ b/muse2/share/locale/muse_pl.ts @@ -7030,7 +7030,17 @@ Right-click to show GUI. - + + Remove track(s) + + + + + Are you sure you want to remove this track(s)? + + + + New Nowy @@ -13552,7 +13562,7 @@ Robert Jonsson file_patterns - + Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2) diff --git a/muse2/share/locale/muse_ru.ts b/muse2/share/locale/muse_ru.ts index f447a6ba..ddbda758 100644 --- a/muse2/share/locale/muse_ru.ts +++ b/muse2/share/locale/muse_ru.ts @@ -5619,6 +5619,14 @@ To apply the changes, please restart MusE. Sorry. Purge hidden events from selected parts + + Remove track(s) + + + + Are you sure you want to remove this track(s)? + + MusEGui::AudioMixerApp diff --git a/muse2/share/locale/muse_sv_SE.ts b/muse2/share/locale/muse_sv_SE.ts index ed008788..b0d15d31 100644 --- a/muse2/share/locale/muse_sv_SE.ts +++ b/muse2/share/locale/muse_sv_SE.ts @@ -5740,6 +5740,14 @@ försöka fixa det senare) Purge hidden events from selected parts Ta bort gömda even från valda parter + + Remove track(s) + + + + Are you sure you want to remove this track(s)? + + MusEGui::AudioMixerApp -- cgit v1.2.3