From d4eb1d97d19366ef04e035865f469775afacef41 Mon Sep 17 00:00:00 2001 From: Werner Schweer Date: Mon, 8 May 2006 16:19:14 +0000 Subject: updates --- muse/CMakeLists.txt | 2 +- muse/doc/man/de/CMakeLists.txt | 8 +++- muse/doc/man/de/projekte.tex | 19 +++++++++ muse/gen | 11 ++--- muse/muse/muse.cpp | 88 ++++------------------------------------ muse/muse/muse.h | 4 +- muse/muse/shortcuts.cpp | 4 -- muse/muse/shortcuts.h | 2 - muse/muse/widgets/CMakeLists.txt | 3 +- 9 files changed, 42 insertions(+), 99 deletions(-) diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt index 63b7fc8a..97a81145 100644 --- a/muse/CMakeLists.txt +++ b/muse/CMakeLists.txt @@ -39,7 +39,7 @@ option ( ENABLE_DSSI "enable Disposable Soft Synth Interface" ON) option ( ENABLE_VST "enable VST/win support" OFF) option ( ENABLE_FLUID "enable fluidsynth softsynth plugins" ON) -set(CMAKE_VERBOSE_MAKEFILE ON) +# set(CMAKE_VERBOSE_MAKEFILE ON) set(QT_USE_QTXML TRUE) set(QT_USE_QTDESIGNER TRUE) diff --git a/muse/doc/man/de/CMakeLists.txt b/muse/doc/man/de/CMakeLists.txt index 994831b1..0aa18c16 100644 --- a/muse/doc/man/de/CMakeLists.txt +++ b/muse/doc/man/de/CMakeLists.txt @@ -26,7 +26,11 @@ add_custom_command ( ${CMAKE_CURRENT_SOURCE_DIR}/man-de.tex ${CMAKE_CURRENT_SOURCE_DIR}/projekte.tex COMMAND ${TEXEXEC_PATH}/texexec - ARGS --language=en --verbose --batch --pdf --result=man-de.pdf man-de.tex + ARGS --language=en --verbose --batch --pdf + --path=${CMAKE_CURRENT_SOURCE_DIR} + --result=${CMAKE_CURRENT_BINARY_DIR}/man-de.pdf + man-de.tex + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) add_custom_target ( man-de ALL @@ -34,7 +38,7 @@ add_custom_target ( man-de ALL ) install_files ( /share/${MusE_INSTALL_NAME}/doc/ .pdf - ${CMAKE_CURRENT_SOURCE_DIR}/man-de.pdf ) + ${CMAKE_CURRENT_BINARY_DIR}/man-de.pdf ) set (extraClean man-de.log man-de.tmp man-de.tuo man-de.tui man-de-mpgraph.mp mpgraph.mp ) diff --git a/muse/doc/man/de/projekte.tex b/muse/doc/man/de/projekte.tex index 0d1474cf..85a7f2ce 100644 --- a/muse/doc/man/de/projekte.tex +++ b/muse/doc/man/de/projekte.tex @@ -64,3 +64,22 @@ Projekte können auf der Platte ohne Probleme verschoben werden, da sie keine absoluten Pfade enthalten. + \section{Wavedateien und Samplerate} + + \index{Wavedateien}\index{Audioprojekte}\index{Midiprojekte} + \index{Samplerate} + MusE unterscheidet zwischen Midiprojekten und Audioprojekten. + Audioprojekte enthalten zusätzlich zu eventuell vorhandenen + Mididaten Wavedateien. + + Audioprojekte sind immer mit einer bestimmten Samplerate + verbunden und können nur geladen und bearbeitet werden, wenn + die Projekt Samplerate mit der aktuellen Samplerate übereinstimmt. + + Die aktuelle Samplerate wird immer vom JACK Server bestimmt und + kann von \M\ nicht verändert werden. + + Werden Wavedateien mit einer anderen Samplerate als der aktuellen + importiert, so müssen sie konvertiert (resampled\index{resample}) + werden. + diff --git a/muse/gen b/muse/gen index afa57d5c..6bffe0b4 100755 --- a/muse/gen +++ b/muse/gen @@ -1,13 +1,9 @@ #!/bin/sh # -# out of source build +# out of source build of MusE # all generated files go into subdirectory "build" # -# NOTICE: -# this does (yet) not work; for unknown reasons *.ui file -# dependencies are not properly handled -# if test ! -d build; then @@ -25,5 +21,10 @@ if test ! -d build; cp ../all.h . echo "+start top level make..." + +# +# HACK: +cp ../all.h . + make diff --git a/muse/muse/muse.cpp b/muse/muse/muse.cpp index 56816c37..dba0a186 100644 --- a/muse/muse/muse.cpp +++ b/muse/muse/muse.cpp @@ -63,13 +63,11 @@ static pthread_t watchdogThread; static const char* fileOpenText = - QT_TR_NOOP("Click this button to open a new song.
" - "You can also select the Open command from the File menu."); + QT_TR_NOOP("Click this button to select a new project\n" + "You can also select the Open command from the Project menu."); static const char* fileSaveText = - QT_TR_NOOP("Click this button to save the song you are " - "editing. You will be prompted for a file name.\n" - "You can also select the Save command from the File menu."); -static const char* fileNewText = QT_TR_NOOP("Create New Song"); + QT_TR_NOOP("Click this button to save the project you are editing.\n" + "You can also select the Save command from the Project menu."); static const char* infoLoopButton = QT_TR_NOOP("loop between left mark and right mark"); static const char* infoPunchinButton = QT_TR_NOOP("record starts at left mark"); @@ -504,22 +502,14 @@ MusE::MusE() startAction->setWhatsThis(tr(infoStartButton)); connect(startAction, SIGNAL(triggered()), song, SLOT(rewindStart())); -// rewindAction = new QAction(QIcon(*frewindIcon), tr("Rewind"), this); rewindAction->setWhatsThis(tr(infoRewindButton)); -// forwardAction = new QAction(QIcon(*fforwardIcon), tr("Forward"), this); forwardAction->setWhatsThis(tr(infoForwardButton)); -// stopAction = new QAction(QIcon(*stopIcon), tr("Stop"), this); stopAction->setWhatsThis(tr(infoStopButton)); -// stopAction->setCheckable(true); -// stopAction->setChecked(true); connect(stopAction, SIGNAL(triggered(bool)), song, SLOT(setStop(bool))); -// playAction = new QAction(QIcon(*playIcon), tr("Play"), this); playAction->setWhatsThis(tr(infoPlayButton)); -// playAction->setCheckable(true); -// playAction->setChecked(false); connect(playAction, SIGNAL(triggered(bool)), song, SLOT(setPlay(bool))); recordAction = new QAction(*recordIcon, tr("Record"), this); @@ -544,10 +534,6 @@ MusE::MusE() //----Actions - fileNewAction = new QAction(*filenewIcon, tr("&New"), this); - fileNewAction->setToolTip(tr(fileNewText)); - fileNewAction->setWhatsThis(tr(fileNewText)); - fileOpenAction = new QAction(QIcon(*openIcon), tr("&Open"), this); fileOpenAction->setToolTip(tr(fileOpenText)); fileOpenAction->setWhatsThis(tr(fileOpenText)); @@ -559,7 +545,6 @@ MusE::MusE() pianoAction = new QAction(*pianoIconSet, tr("Pianoroll"), this); connect(pianoAction, SIGNAL(triggered()), SLOT(startPianoroll())); - connect(fileNewAction, SIGNAL(triggered()), SLOT(loadTemplate())); connect(fileOpenAction, SIGNAL(triggered()), SLOT(loadProject())); connect(fileSaveAction, SIGNAL(triggered()), SLOT(save())); @@ -567,10 +552,9 @@ MusE::MusE() // Toolbar //-------------------------------------------------- - tools = new QToolBar(tr("File Buttons")); + tools = new QToolBar(tr("Project Buttons")); addToolBar(tools); - tools->addAction(fileNewAction); tools->addAction(fileOpenAction); tools->addAction(fileSaveAction); tools->addAction(QWhatsThis::createAction(this)); @@ -606,9 +590,8 @@ MusE::MusE() // File //------------------------------------------------------------- - menu_file = mb->addMenu(tr("&File")); + menu_file = mb->addMenu(tr("&Project")); - menu_file->addAction(fileNewAction); menu_file->addAction(fileOpenAction); openRecent = new QMenu(tr("Open &Recent"), this); @@ -618,7 +601,6 @@ MusE::MusE() menu_ids[CMD_OPEN_RECENT] = menu_file->addMenu(openRecent); menu_file->addSeparator(); menu_file->addAction(fileSaveAction); - menu_ids[CMD_SAVE_AS] = menu_file->addAction(tr("Save &As"), this, SLOT(saveAs())); menu_file->addSeparator(); menu_ids[CMD_IMPORT_MIDI] = menu_file->addAction(*openIconS, tr("Import Midifile")); connect(menu_ids[CMD_IMPORT_MIDI], SIGNAL(triggered()), this, SLOT(importMidi())); @@ -1281,39 +1263,13 @@ void MusE::loadProject() } } -//--------------------------------------------------------- -// loadTemplate -//--------------------------------------------------------- - -void MusE::loadTemplate() - { - QString start(museGlobalShare); - start += "/templates"; - QString fn = QFileDialog::getOpenFileName( - this, - tr("MusE: load template"), - start, - medFilePattern - ); - if (!fn.isEmpty()) { - loadProjectFile(fn, true, true); - setUntitledProject(); - } - } - //--------------------------------------------------------- // save //--------------------------------------------------------- bool MusE::save() { - if (project.baseName() == "untitled" - || (!project.suffix().isEmpty() && project.suffix() != "med")) { - return saveAs(); - } - else - return save(project.filePath(), false); - return true; + return save(project.filePath(), false); } //--------------------------------------------------------- @@ -1474,33 +1430,6 @@ void MusE::showTransport(bool flag) transport->setValues(); } -//--------------------------------------------------------- -// saveAs -//--------------------------------------------------------- - -bool MusE::saveAs() - { - QStringList pattern; - const char** p = med_file_pattern; - while (*p) - pattern << *p++; - - QString name = getSaveFileName(QString(""), pattern, this, - tr("MusE: Save As")); - bool ok = false; - if (!name.isEmpty()) { - ok = save(name, true); - if (ok) { - project.setFile(name); - setWindowTitle(tr("MusE: Song: ") + project.baseName()); - addProject(project); - museProject = project.absolutePath(); - } - } - - return ok; - } - //--------------------------------------------------------- // printVersion //--------------------------------------------------------- @@ -2712,13 +2641,10 @@ void MusE::startEditInstrument() void MusE::updateConfiguration() { fileOpenAction->setShortcut(shortcuts[SHRT_OPEN].key); - fileNewAction->setShortcut(shortcuts[SHRT_NEW].key); fileSaveAction->setShortcut(shortcuts[SHRT_SAVE].key); menuEditActions[CMD_DELETE]->setShortcut(shortcuts[SHRT_DELETE].key); menu_ids[CMD_OPEN_RECENT]->setShortcut(shortcuts[SHRT_OPEN_RECENT].key); -//TD menu_ids[CMD_LOAD_TEMPLATE]->setShortcut(shortcuts[SHRT_LOAD_TEMPLATE].key); - menu_ids[CMD_SAVE_AS]->setShortcut(shortcuts[SHRT_SAVE_AS].key); menu_ids[CMD_IMPORT_MIDI]->setShortcut(shortcuts[SHRT_IMPORT_MIDI].key); menu_ids[CMD_EXPORT_MIDI]->setShortcut(shortcuts[SHRT_EXPORT_MIDI].key); menu_ids[CMD_IMPORT_AUDIO]->setShortcut(shortcuts[SHRT_IMPORT_AUDIO].key); diff --git a/muse/muse/muse.h b/muse/muse/muse.h index d8288734..6720bf4f 100644 --- a/muse/muse/muse.h +++ b/muse/muse/muse.h @@ -73,7 +73,7 @@ class MusE : public QMainWindow, public Ui::MuseBase }; //File menu items: - enum { CMD_OPEN_RECENT=0, CMD_LOAD_TEMPLATE, CMD_SAVE_AS, CMD_IMPORT_MIDI, + enum { CMD_OPEN_RECENT=0, CMD_IMPORT_MIDI, CMD_EXPORT_MIDI, CMD_IMPORT_AUDIO, CMD_QUIT, CMD_OPEN_DRUMS, CMD_OPEN_LIST, CMD_OPEN_LIST_MASTER, CMD_GLOBAL_CONFIG, CMD_OPEN_GRAPHIC_MASTER, CMD_OPEN_MIDI_TRANSFORM, CMD_TRANSPOSE, @@ -250,14 +250,12 @@ class MusE : public QMainWindow, public Ui::MuseBase void syncChanged(); public slots: - bool saveAs(); void bounceToFile(); void closeEvent(QCloseEvent*e); void loadProjectFile(const QString&); void loadProjectFile(const QString&, bool songTemplate, bool loadAll); void loadTheme(const QString&); bool seqStart(); - void loadTemplate(); void showTransport(bool flag); void showBigtime(bool); void showMixer1(bool); diff --git a/muse/muse/shortcuts.cpp b/muse/muse/shortcuts.cpp index 3cfc3b15..a5127e53 100644 --- a/muse/muse/shortcuts.cpp +++ b/muse/muse/shortcuts.cpp @@ -235,15 +235,11 @@ void initShortCuts() //----------------------------------------------------------- // Arranger: - defShrt(SHRT_NEW, Qt::CTRL + Qt::Key_N, 14, ARRANG_SHRT + DEDIT_SHRT, "new_project"); defShrt(SHRT_OPEN, Qt::CTRL + Qt::Key_O, 15, ARRANG_SHRT + DEDIT_SHRT, "open_project"); defShrt(SHRT_SAVE, Qt::CTRL + Qt::Key_S, 16, ARRANG_SHRT + DEDIT_SHRT, "save_project"); //----------------------------------------------------------- defShrt(SHRT_OPEN_RECENT, Qt::CTRL + Qt::Key_1, 17, ARRANG_SHRT, "open_recent"); - defShrt(SHRT_SAVE_AS, 0 , 18, ARRANG_SHRT, "save_project_as"); - defShrt(SHRT_LOAD_TEMPLATE, 0 , 19, ARRANG_SHRT, "load_template"); -// defShrt(SHRT_CONFIG_PRINTER, Qt::CTRL + Qt::Key_P, "Configure printer", ARRANG_SHRT, "config_printer"); defShrt(SHRT_IMPORT_MIDI, 0 , 20, ARRANG_SHRT, "import_midi"); defShrt(SHRT_EXPORT_MIDI, 0 , 21, ARRANG_SHRT, "export_midi"); diff --git a/muse/muse/shortcuts.h b/muse/muse/shortcuts.h index 17c12a14..f7b885f9 100644 --- a/muse/muse/shortcuts.h +++ b/muse/muse/shortcuts.h @@ -111,7 +111,6 @@ enum { SHRT_START_REC, // *(keypad) //Main + Drumeditor - SHRT_NEW, //Ctrl+N SHRT_OPEN, //Ctrl+O SHRT_SAVE, //Ctrl+S @@ -125,7 +124,6 @@ enum { //Main: - SHRT_SAVE_AS, //Default: undefined SHRT_OPEN_RECENT, //Ctrl+1 SHRT_LOAD_TEMPLATE, //Default: undefined SHRT_CONFIG_PRINTER, //Ctrl+P diff --git a/muse/muse/widgets/CMakeLists.txt b/muse/muse/widgets/CMakeLists.txt index 9c0810eb..4cf9d05b 100644 --- a/muse/muse/widgets/CMakeLists.txt +++ b/muse/muse/widgets/CMakeLists.txt @@ -64,7 +64,8 @@ add_library ( widgets STATIC ${widget_mocs} utils.cpp - shortcutconfig.cpp + shortcutconfig.cpp + shortcutconfig.h shortcutcapturedialog.cpp midisync.cpp comment.cpp -- cgit v1.2.3