summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse/TODO15
-rw-r--r--muse/config.h.in5
-rw-r--r--muse/muse/muse.cpp21
-rw-r--r--muse/muse/muse.h4
4 files changed, 23 insertions, 22 deletions
diff --git a/muse/TODO b/muse/TODO
index e6d83405..2d83731e 100644
--- a/muse/TODO
+++ b/muse/TODO
@@ -1,6 +1,17 @@
-----------------------------TODO-------------------------------------------
(4.5.2006)
-
+ - manage project subdirectories (better organize wave files)
+ - muse is always associated with a project, there is no
+ "No Project" or "Default Project"
+ - muse on start asks for a project name (select or create)
+ - midi files cannot be loaded directly als project anymore,
+ you have to first create a project and then call
+ "import midifile"
+ - "New File" and "Select File" are combined into
+ "Select Project"
+ - there is no "Save As" anymore (your project always has a
+ name)
+
BUGS
- updating the gui during midi recording is too slow;
a new, faster implementation is needed
@@ -39,8 +50,6 @@ FEATURES
- NEW function with templates
- - manage project subdirectories (better organize wave files)
-
CLEANUPS
- Cleanup the icon/pixmap handling using Qt resource file:
diff --git a/muse/config.h.in b/muse/config.h.in
index d18eb91e..23d2162c 100644
--- a/muse/config.h.in
+++ b/muse/config.h.in
@@ -20,3 +20,8 @@
#cmakedefine DSSI_SUPPORT
#cmakedefine VST_SUPPORT
+
+#define INSTALL_NAME "${MusE_INSTALL_NAME}"
+#define INSTPREFIX "${CMAKE_INSTALL_PREFIX}"
+#define VERSION "${MusE_VERSION_FULL}"
+
diff --git a/muse/muse/muse.cpp b/muse/muse/muse.cpp
index 48d7414a..56816c37 100644
--- a/muse/muse/muse.cpp
+++ b/muse/muse/muse.cpp
@@ -1851,27 +1851,18 @@ static void catchSignal(int sig)
int main(int argc, char* argv[])
{
- puts(PACKAGEVERSION);
-
museUser = QString(getenv("MUSEHOME"));
if (museUser.isEmpty())
museUser = QString(getenv("HOME"));
QString museGlobal;
const char* p = getenv("MUSE");
- if (p)
- museGlobal = p;
+ museGlobal = p ? p : INSTPREFIX;
- if (museGlobal.isEmpty()) {
- QString museGlobal(INSTPREFIX);
- museGlobalLib = museGlobal + "/lib/" PACKAGEVERSION;
- museGlobalShare = museGlobal + "/share/" PACKAGEVERSION;
- }
- else {
- museGlobalLib = museGlobal + "/lib/" PACKAGEVERSION;
- museGlobalShare = museGlobal + "/share/" PACKAGEVERSION;
- }
- museProject = museProjectInitPath; //getcwd(0, 0);
- configName = QString(getenv("HOME")) + QString("/." PACKAGEVERSION);
+ museGlobalLib = museGlobal + "/lib/" INSTALL_NAME;
+ museGlobalShare = museGlobal + "/share/" INSTALL_NAME;
+
+ museProject = museProjectInitPath;
+ configName = museUser + QString("/." INSTALL_NAME);
srand(time(0)); // initialize random number generator
initMidiController();
diff --git a/muse/muse/muse.h b/muse/muse/muse.h
index df9267c5..d8288734 100644
--- a/muse/muse/muse.h
+++ b/muse/muse/muse.h
@@ -21,10 +21,6 @@
#ifndef __APP_H__
#define __APP_H__
-#define VERSION "1.0"
-#define PACKAGEVERSION "1.0"
-#define INSTPREFIX "/usr/bin"
-
#include "ui_muse.h"
#include "cobject.h"
#include "widgets/tools.h"