From 83898a46ade9f248fdae8703e97b3ea1bc03273d Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Mon, 27 Dec 2010 00:52:36 +0000 Subject: Please see the ChangeLog --- muse2/AUTHORS | 1 + muse2/CMakeLists.txt | 3 +- muse2/ChangeLog | 7 +++ muse2/man/CMakeLists.txt | 37 ++++++++++++++ muse2/man/grepmidi.1.in | 45 +++++++++++++++++ muse2/man/muse.1.in | 101 +++++++++++++++++++++++++++++++++++++ muse2/muse/CMakeLists.txt | 2 +- muse2/muse/main.cpp | 4 -- muse2/muse/midiedit/CMakeLists.txt | 1 + muse2/muse/widgets/filedialog.cpp | 30 ----------- muse2/packaging/CMakeLists.txt | 16 +++++- muse2/packaging/muse.desktop | 9 ---- muse2/packaging/muse.desktop.in | 10 ++++ muse2/packaging/muse.xml | 9 ++++ 14 files changed, 229 insertions(+), 46 deletions(-) create mode 100644 muse2/man/CMakeLists.txt create mode 100644 muse2/man/grepmidi.1.in create mode 100644 muse2/man/muse.1.in delete mode 100644 muse2/packaging/muse.desktop create mode 100644 muse2/packaging/muse.desktop.in create mode 100644 muse2/packaging/muse.xml diff --git a/muse2/AUTHORS b/muse2/AUTHORS index 048d8824..c4a8542c 100644 --- a/muse2/AUTHORS +++ b/muse2/AUTHORS @@ -13,5 +13,6 @@ Mathias Lundgren lunar_shuttle Joachim Schiele qknight Robert Jonsson spamatica Tim Donnelly terminator356 +Orcan Ogetbil ogetbilo Fluidsynth logo designed by Josh "Swami" Green. diff --git a/muse2/CMakeLists.txt b/muse2/CMakeLists.txt index c0018fd0..0e948cd4 100644 --- a/muse2/CMakeLists.txt +++ b/muse2/CMakeLists.txt @@ -67,6 +67,7 @@ SET(MusE_VERSION_PATCH 0) SET(MusE_VERSION "2.0alpha") SET(MusE_VERSION_FULL "2.0alpha") SET(MusE_INSTALL_NAME "muse-2.0alpha") +SET(MusE_EXEC_NAME "muse2") ## The library where we will install the shared components: SET(MusE_MODULES_DIR ${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/modules) @@ -357,7 +358,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "-g -DQT_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}") #subdirs(al lib grepmidi plugins muse share demos synti ) # NOTE: share/ directory needs to be at the end so that the translations # are scanned before coming to share/locale -subdirs(al awl grepmidi plugins muse synti packaging utils demos share) +subdirs(al awl grepmidi man plugins muse synti packaging utils demos share) ## Install doc files file (GLOB doc_files diff --git a/muse2/ChangeLog b/muse2/ChangeLog index fe9d8ed8..2bd93b25 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -8,6 +8,13 @@ - changed 'new' project from listing PROJECT_VIEW to GLOBAL_VIEW where the templates reside, an enhancement would be to list USER_VIEW if it's template dir exists (rj) + - Added myself to the AUTHORS list. Oops. (Orcan) + - Added a mimetype file for *.med, *.med.gz, *.med.bz2 and associated MusE with this + mimetype (and also midi and xml mimetypes) in the .desktop file. (Orcan) + - Got manpages from Debian by Daniel Kobras, and updated them for MusE2. (Orcan) + - Remove rem'd preview code in filedialog.cpp. I reimplemented it in appearance.cpp. (Orcan) + - Remove the environment variables info from the usage output. (Orcan) + - midiedit links to ctrl. (Orcan) 26.12.2010: - Initial addition of midi track info to pianoroll. WORK IN PROGRESS. (Tim) TODO: Just to get off the hard drive. A few things still need to be linked up! diff --git a/muse2/man/CMakeLists.txt b/muse2/man/CMakeLists.txt new file mode 100644 index 00000000..a76a8e4a --- /dev/null +++ b/muse2/man/CMakeLists.txt @@ -0,0 +1,37 @@ +#============================================================================= +# MusE +# Linux Music Editor +# $Id:$ +# +# Copyright (C) 2002-2006 by Werner Schweer and others +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +#============================================================================= + +# +# produce the manpages +# +configure_file ( + muse.1.in + ${PROJECT_BINARY_DIR}/man/${MusE_EXEC_NAME}.1 + ) +configure_file ( + grepmidi.1.in + ${PROJECT_BINARY_DIR}/man/grepmidi.1 + ) + +install( FILES + ${PROJECT_BINARY_DIR}/man/${MusE_EXEC_NAME}.1 + ${PROJECT_BINARY_DIR}/man/grepmidi.1 + DESTINATION ${SHARE_INSTALL_PREFIX}/man/man1/ + ) diff --git a/muse2/man/grepmidi.1.in b/muse2/man/grepmidi.1.in new file mode 100644 index 00000000..3aa19904 --- /dev/null +++ b/muse2/man/grepmidi.1.in @@ -0,0 +1,45 @@ +.\" grepmidi -- display structure of MIDI files +.\" Copyright (c) 2006 Daniel Kobras +.\" +.\" This manual page is free software; you can redistribute it and/or modify +.\" it under the terms of the GNU General Public License as published by +.\" the Free Software Foundation; either version 2 of the License, or +.\" (at your option) any later version. +.\" +.\" This program is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License +.\" along with this program; if not, write to the Free Software +.\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +.\" +.\" This manual page was written especially for Debian GNU/Linux. +.\" +.TH GREPMIDI 1 "July 2006" +.SH NAME +grepmidi \- display structure of MIDI files +.SH SYNOPSIS +\fBgrepmidi\fR [ \fI-f\fR ] \fIfile\fR [ \fI...\fR ] +.SH DESCRIPTION +The \fBgrepmidi\fR utility provides a simple parser for files in raw MIDI +format. It is far from complete, but allows to get a grip of the basic +song structure in \fIfile\fR. That is, it does not display single note, +but only meta information embedded in the MIDI file. \fBgrepmidi\fR can +also be useful to check whether a given MIDI file contains errors. +.PP +More than one \fIfile\fR can be given on the commandline. Option \fB-f\fR +tells \fBgrepmidi\fR to prepend each line of output with the filename that +is currently checked. +.PP +\fBgrepmidi\fR is distributed along with \fBMusE\fR, a full-fledged MIDI +Music Editor. +.SH "SEE ALSO" +.BR ${MusE_EXEC_NAME} (1). +.SH AUTHORS +.B grepmidi +was written by Werner Schweer . +.PP +This manual page was written by Daniel Kobras for the +Debian GNU/Linux system (but may be used by others). diff --git a/muse2/man/muse.1.in b/muse2/man/muse.1.in new file mode 100644 index 00000000..cd839a4e --- /dev/null +++ b/muse2/man/muse.1.in @@ -0,0 +1,101 @@ +.\" MusE -- MIDI/Audio Sequencer +.\" Copyright (c) 2006 Daniel Kobras +.\" Copyright (c) 2010 Orcan Ogetbil +.\" +.\" This manual page is free software; you can redistribute it and/or modify +.\" it under the terms of the GNU General Public License as published by +.\" the Free Software Foundation; either version 2 of the License, or +.\" (at your option) any later version. +.\" +.\" This program is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License +.\" along with this program; if not, write to the Free Software +.\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +.\" +.\" This manual page was written especially for Debian but may be used by +.\" others of course. +.\" +.TH MUSE 1 "December 2010" +.SH NAME +MusE \- MIDI/Audio Sequencer +.SH SYNOPSIS +.B ${MusE_EXEC_NAME} +[ \fIoptions\fR ] [ \fIfile\fR ] +.SH DESCRIPTION +.B MusE +is a MIDI/Audio sequencer that can also record and edit sound files, apply +effects and filters from an intuitive graphical interface. It is based on +the Linux-specific ALSA interface for audio i/o. The Jack Audio Connection +Kit is used for routing. LADSPA-compliant plugins allow to extend the +list of available effects. +.PP +The optional +.I file +argument denotes a project file in MusE-internal format that is loaded on +startup. Project files can also be loaded later on through the graphical menu. +.SH OPTIONS +.TP +.B -a +Use a dummy audio backend instead of real audio i/o. +.TP +.B -d +Start in debugging mode without real-time threads. +.TP +.B -D +Enable verbose debugging messages. +.TP +.B -h +Display usage information. +.TP +.B -I +Do not attempt to load any DSSI plugins. +.TP +.B -l \fIxx\fR +Force locale to the language/country code xx. +.TP +.B -L +Do not se LASH. +.TP +.B -m +Provide debugging messages about midi input events. +.TP +.B -M +Provide debugging messages about midi output events. +.TP +.B -p +Do not attempt to load any LADSPA plugins. +.TP +.B -P \fIn\fR +Set scheduling priority of real-time threads to \fIn\fR (Dummy only, default 40. Else fixed by Jack.). +.TP +.B -s +Provide debugging messages about sync events. +.TP +.B -v +Print version information. +.TP +.B -V +Do not attempt to load any VST plugins. +.TP +.B -y +Enable Python control support. +.TP +.B -Y \fIn\fR +Force midi real time priority to n. +.SH "SEE ALSO" +.B MusE +provides an integrated help system in the graphical user interface. +.SH AUTHORS +.B MusE +was written by Werner Schweer, Robert Jonnson, Mathias Lundgren, +Frank Neumann, Joachim Schiele, Tim Donnelly, Nil Geisweiller, +Orcan Ogetbil and others. +.PP +This manual page was originally written by Daniel Kobras + for the Debian GNU/Linux system +(but may be used by others). It was updated later by +Orcan Ogetbil for MusE2. diff --git a/muse2/muse/CMakeLists.txt b/muse2/muse/CMakeLists.txt index fe35ca65..3a8c5564 100644 --- a/muse2/muse/CMakeLists.txt +++ b/muse2/muse/CMakeLists.txt @@ -204,7 +204,7 @@ set_target_properties( core OUTPUT_NAME muse_core ) set_target_properties( muse - PROPERTIES OUTPUT_NAME muse2 + PROPERTIES OUTPUT_NAME ${MusE_EXEC_NAME} ) set_target_properties( icons PROPERTIES OUTPUT_NAME muse_icons diff --git a/muse2/muse/main.cpp b/muse2/muse/main.cpp index ff4931bd..fccf801d 100644 --- a/muse2/muse/main.cpp +++ b/muse2/muse/main.cpp @@ -210,10 +210,6 @@ static void usage(const char* prog, const char* txt) fprintf(stderr, " -L don't use LASH\n"); #endif fprintf(stderr, " -l xx force locale to the given language/country code (xx = %s)\n", localeList().toLatin1().constData()); - fprintf(stderr, "useful environment variables:\n"); - fprintf(stderr, " MUSE override library and shared directories location\n"); - fprintf(stderr, " MUSEHOME override user home directory (HOME/)\n"); - fprintf(stderr, " MUSEINSTRUMENTS override user instrument directory (MUSEHOME/muse_instruments)\n"); } //--------------------------------------------------------- diff --git a/muse2/muse/midiedit/CMakeLists.txt b/muse2/muse/midiedit/CMakeLists.txt index 3d0efe82..94bed2b2 100644 --- a/muse2/muse/midiedit/CMakeLists.txt +++ b/muse2/muse/midiedit/CMakeLists.txt @@ -91,6 +91,7 @@ set_target_properties( midiedit target_link_libraries ( midiedit ${QT_LIBRARIES} al + ctrl icons widgets ctrl diff --git a/muse2/muse/widgets/filedialog.cpp b/muse2/muse/widgets/filedialog.cpp index 02d4efb9..28c65ba5 100644 --- a/muse2/muse/widgets/filedialog.cpp +++ b/muse2/muse/widgets/filedialog.cpp @@ -247,36 +247,6 @@ void MFileDialog::directoryChanged(const QString&) } } -/* ORCAN - disable preview for now. It is not available in qt4. We will - need to implement it ourselves. -//--------------------------------------------------------- -// ContentsPreview -//--------------------------------------------------------- - -ContentsPreview::~ContentsPreview() - { - if (bg) - delete bg; - } - -//--------------------------------------------------------- -// ContentsPreview::showPreview -//--------------------------------------------------------- - -void ContentsPreview::previewUrl(const Q3Url& url) - { - if (!url.isLocalFile()) - return; - if (url.path() == path) - return; - path = url.path(); - if (bg) - delete bg; - bg = new QPixmap(path); - if (bg) - setBackgroundPixmap(*bg); - } -*/ //--------------------------------------------------------- // getFilterExtension diff --git a/muse2/packaging/CMakeLists.txt b/muse2/packaging/CMakeLists.txt index e9b749b2..2582848a 100644 --- a/muse2/packaging/CMakeLists.txt +++ b/muse2/packaging/CMakeLists.txt @@ -18,10 +18,24 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #============================================================================= +# +# produce the .desktop file +# +configure_file ( + muse.desktop.in + ${PROJECT_BINARY_DIR}/packaging/muse.desktop + ) + +# +# install the desktop and mime files +# install( FILES muse_icon.png DESTINATION ${SHARE_INSTALL_PREFIX}/icons/hicolor/64x64/apps/ ) -install( FILES muse.desktop +install( FILES ${PROJECT_BINARY_DIR}/packaging/muse.desktop DESTINATION ${SHARE_INSTALL_PREFIX}/applications/ ) +install( FILES muse.xml + DESTINATION ${SHARE_INSTALL_PREFIX}/mime/packages/ + ) diff --git a/muse2/packaging/muse.desktop b/muse2/packaging/muse.desktop deleted file mode 100644 index e8444960..00000000 --- a/muse2/packaging/muse.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=MusE -GenericName=Audio/MIDI Sequencer -Comment=Midi Music Editor -Icon=muse_icon -Type=Application -Exec=muse2 -Terminal=false -Categories=Sequencer;Midi;X-Jack;X-Sequencers;X-MIDI;Audio;AudioVideo; diff --git a/muse2/packaging/muse.desktop.in b/muse2/packaging/muse.desktop.in new file mode 100644 index 00000000..8977cbec --- /dev/null +++ b/muse2/packaging/muse.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=MusE +GenericName=Audio/MIDI Sequencer +Comment=Midi Music Editor +Icon=muse_icon +Type=Application +Exec=${MusE_EXEC_NAME} +Terminal=false +Categories=Sequencer;Midi;X-Jack;X-Sequencers;X-MIDI;Audio;AudioVideo; +MimeType=audio/midi;application/x-muse;application/xml; diff --git a/muse2/packaging/muse.xml b/muse2/packaging/muse.xml new file mode 100644 index 00000000..0b02e74a --- /dev/null +++ b/muse2/packaging/muse.xml @@ -0,0 +1,9 @@ + + + + MusE file + + + + + -- cgit v1.2.3