Made 0.4.5 release

Bumped version number to 0.4.5 in CMakeLists.txt and README.

CMakeLists.txt

@@ -15,7 +15,7 @@ INCLUDE(FindPkgConfig)
 
 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "4")
-SET(VERSION_PATCH "3")
+SET(VERSION_PATCH "5")
 #SET(VERSION_SUFFIX "")
 SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 IF(VERSION_SUFFIX)
@@ -33,9 +33,10 @@ ELSE(LMMS_HOST_X86_64)
 ENDIF(LMMS_HOST_X86_64)
 
 OPTION(WANT_ALSA	"Include ALSA (Advanced Linux Sound Architecture) support" ON)
+OPTION(WANT_CALF	"Include CALF LADSPA plugins" ON)
 OPTION(WANT_CAPS	"Include C* Audio Plugin Suite (LADSPA plugins)" ON)
 OPTION(WANT_CMT		"Include Computer Music Toolkit LADSPA plugins" ON)
-OPTION(WANT_FFTW3F	"Include SpectrumAnalyzer plugin" ON)
+OPTION(WANT_FFTW3F	"Include SpectrumAnalyzer and ZynAddSubFX plugin" ON)
 OPTION(WANT_JACK	"Include JACK (Jack Audio Connection Kit) support" ON)
 OPTION(WANT_OGGVORBIS	"Include OGG/Vorbis support" ON)
 OPTION(WANT_PULSEAUDIO	"Include PulseAudio support" ON)
@@ -118,6 +119,13 @@ IF(NOT SNDFILE_FOUND)
 	MESSAGE(FATAL_ERROR "LMMS requires libsndfile1 and libsndfile1-dev >= 1.0.11 - please install, remove CMakeCache.txt and try again!")
 ENDIF(NOT SNDFILE_FOUND)
 
+IF(WANT_CALF)
+SET(LMMS_HAVE_CALF TRUE)
+SET(STATUS_CALF "OK")
+ELSE(WANT_CALF)
+SET(STATUS_CALF "not built as requested")
+ENDIF(WANT_CALF)
+
 IF(WANT_CAPS)
 SET(LMMS_HAVE_CAPS TRUE)
 SET(STATUS_CAPS "OK")
@@ -325,7 +333,7 @@ ENDIF(LMMS_BUILD_WIN32)
 
 # check for libsamplerate
 IF(WANT_SYSTEM_SR)
-	PKG_CHECK_MODULES(SAMPLERATE samplerate>=0.1.6)
+	PKG_CHECK_MODULES(SAMPLERATE samplerate>=0.1.7)
 	IF(SAMPLERATE_FOUND)
 		SET(LMMS_HAVE_SAMPLERATE TRUE)
 	ENDIF(SAMPLERATE_FOUND)
@@ -434,6 +442,7 @@ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/lmms.1.gz COMMAND gzip -c ${CMAKE_
 ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${lmms_INCLUDES} ${LIBSAMPLERATE_SOURCES} ${LMMS_ER_H} ${lmms_UI_out} lmmsconfig.h ${WINRC} ${CMAKE_BINARY_DIR}/lmms.1.gz)
 
 IF(LMMS_BUILD_WIN32)
+
 	SET_TARGET_PROPERTIES(lmms PROPERTIES LINK_FLAGS "${LINK_FLAGS} -mwindows")
 	ADD_CUSTOM_COMMAND(TARGET lmms POST_BUILD COMMAND ${STRIP} ${CMAKE_BINARY_DIR}/lmms.exe)
 
@@ -443,9 +452,15 @@ IF(LMMS_BUILD_WIN32)
 	ELSE(LMMS_BUILD_WIN64)
 		INSTALL(FILES /opt/mingw32/bin/QtCore4.dll /opt/mingw32/bin/QtGui4.dll /opt/mingw32/bin/QtXml4.dll /opt/mingw32/bin/libz.dll /opt/mingw32/bin/libsndfile-1.dll /opt/mingw32/bin/libvorbis-0.dll /opt/mingw32/bin/libvorbisenc-2.dll /opt/mingw32/bin/libvorbisfile-3.dll /opt/mingw32/bin/libogg-0.dll /opt/mingw32/bin/libfluidsynth-1.dll /opt/mingw32/bin/libfftw3f-3.dll /opt/mingw32/bin/SDL.dll /opt/mingw32/i586-pc-mingw32/bin/mingwm10.dll DESTINATION .)
 	ENDIF(LMMS_BUILD_WIN64)
+
 ELSE(LMMS_BUILD_WIN32)
+	IF(NOT LMMS_BUILD_APPLE)
+		SET_TARGET_PROPERTIES(lmms PROPERTIES LINK_FLAGS "${LINK_FLAGS} -Wl,-E")
+	ENDIF(NOT LMMS_BUILD_APPLE)
+
 	INSTALL(TARGETS lmms RUNTIME DESTINATION bin)
 	INSTALL(FILES ${CMAKE_BINARY_DIR}/lmms.1.gz DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+
 ENDIF(LMMS_BUILD_WIN32)
 
 #
@@ -597,10 +612,12 @@ MESSAGE(
 "* VST-instrument hoster       : ${STATUS_VST}\n"
 "* VST-effect hoster           : ${STATUS_VST}\n"
 "* SpectrumAnalyzer            : ${STATUS_FFTW3F}\n"
+"* CALF LADSPA plugins         : ${STATUS_CALF}\n"
 "* CAPS LADSPA plugins         : ${STATUS_CAPS}\n"
 "* CMT LADSPA plugins          : ${STATUS_CMT}\n"
 "* TAP LADSPA plugins          : ${STATUS_TAP}\n"
 "* SWH LADSPA plugins          : ${STATUS_SWH}\n"
+"* ZynAddSubFX                 : ${STATUS_FFTW3F}\n"
 )
 
 MESSAGE(

INSTALL

@@ -5,11 +5,10 @@ then run
 
 mkdir build
 cd build
-cmake ../ -DCMAKE_INSTALL_PREFIX=/usr
+cmake ../
 make
 sudo make install
 
-
 This way an out-of-tree build is performed. You can also run "cmake ." directly
 in the root of source-tree although this is not recommended. When performing an
 out-of-tree build after there's already an in-tree build, make sure to run
@@ -23,3 +22,9 @@ that are going to be built into LMMS or built as plugins. Install the
 according libraries and development files if a certain feature is not enabled.
 Then remove CMakeCache.txt and run cmake again.
 
+If you want to supply an install prefix to cmake, add the flag:
+
+-DCMAKE_INSTALL_PREFIX=<prefix>
+
+Where <prefix> can be /usr, /usr/local, /opt, etc. The default is /usr/local.
+

README

@@ -1,4 +1,4 @@
-Linux MultiMedia Studio 0.4.3
+Linux MultiMedia Studio 0.4.5
 ==============================
 
 Copyright (c) 2004-2009 by LMMS-developers
@@ -52,15 +52,16 @@ Required libraries:
 - Qt >= 4.3.0 with devel-files (4.4.x recommended)
 
 Optional, but strongly recommended:
-- libalsa with devel-files
+- JACK with devel-files
 - libvorbis & libogg with devel-files
-- libfluidsynth with devel files
+- libalsa with devel-files
 - SDL with devel-files
-- libsamplerate >= 0.1.3 with devel-files
+- libsamplerate >= 0.1.7 with devel-files
 - libsndfile with devel-files
 - WINE + WINE-devel-files
 - stk, libstk + libstk-dev
-- JACK with devel-files
+- libfluidsynth with devel files
+- fftw3 with devel-files
 
 For compiling you should have an up to date GCC with g++.
 

TODO

@@ -1,52 +1,32 @@
-- do not process effects when playing frozen patterns
-- select number of channels in export-project-dialog
-- try to make vestige-plugin-dlls relative
-- do song-editor-tempo-connection to vst-plugin inside remoteVSTPlugin
-- add/remove-steps button in bb-editor for adding/removing according number of steps to/from all patterns of visible beat/baseline
-- replace rest of wizard by simple directory-selection-dialog for working-dir when running the first time
-- correctly load steps/dots from FLP-files
-- convert FL-Plucked!-parameters to Vibed-parameters
-- in flp-import-filter: merge play-list-items if possible
-- integrated sample-browser in context-menu of sample-track/-tco
-- make note able of journalling
-- before calling undoStep/redoStep from journallingObject, save journalling-state-context and disabled journalling, restore afterwards
-- intelligent journal-entry-merging
-- undo/redo-support in note/track etc.
-- save tco-settings in trackContentWidget::saveSettings() etc. instead of track::...
-- restore stacking-order of windows when loading project
-- bristol-bindings?
-- resample sample-track-tcos when using hq-mode
-- add support for panes-interface (like blender) (instead of MDI etc.)
+Version 0.4.x
+=============
+
+- save tco-settings in trackContentWidget::saveSettings() etc. instead of 
+  track::...
+- resample sample-track-tcos when exporting at different samplerate
 - message to user when importing unsupported MIDI-file (track-count = 0)
-- AMS/OMS-bindings
-- remove binary-embed-system (Qt4-resource-system?)
-- recording-functionality
-- do not hang when saving while loading VST-plugin (because then we call dispatcher while the load-process is still going on)
-- tempo-recogn. and sync of beat-samples
-- make color-scheme switchable: LMMS / user
+- piano roll: mouse cursor isn't updated correctly in selection mode
+  (from resizing note edit area)
+- when you add vestige, have it automatically pop the find VST plugin dialog
+- try to make vestige-plugin-dlls relative
+- select all MIDI devices by default when you bring up the "connect to controller"
+  window and wait for first event - then uncheck all other MIDI devices that no
+  events were detected from
+- load asdlol.mmpz. if you render it without playing it, or if you play it
+  the first time, you hear unwanted artifacts. (solution: apply automation
+  before playing)
 - autosave every 30s (configurable!) and offer recovery at startup after crash
-- make piano-roll use rubberband instead of implementing a simple one on it's own
-- level-meters in output-graph and instrument-track
-- MIDI-program/MIDI-mapping/process program-/channel-change-events from MIDI-files
-- DSSI-support
-- use drawLineF() for drawing notes in pattern::paintEvent() in qt4-version
-- only redraw region given by paint-event in pattern, bbTCO, sampleTCO etc.
-- pre-listen when opening sample with QFileDialog
-- panning-editing in piano-roll
 - speed up painting of sampleTCO
-- panning env+lfo
-- rewrite export-project-dialog using layout-mechanism
-- make piano-roll use the global clipboard??
-- add more localizations:
-	- Swedish
-	- Norwegian
-	- Greece
-	- ...
+- do not process effects when playing frozen patterns
+- copy-pasted automation patterns have to be manually linked back to
+  their knob for some reason
+- improve TrackLabelButton: split 80%-20% (80%=name, 20%=button showing a popup
+  menu with track operations, make the midi input a top-level menu item)
+- when you click and drag a mixer bar, it doesn't click and drag, it sets
+  absolutely. this is annoying
 
 
-- effect-board -> live-fx from input
-- chord-editor?
-- WAVE/OGG/MP3-Import -> FFT-analysis -> write notes
-- classical note-edit-window -> also ability of printing and maybe later scanning & recognition of notes
-- add FLAC as export-format?
+See TODO file in master branch and/or the TODO list in the Wiki for details
+regarding the development series.
+
 

build_mingw32

@@ -1,7 +1,4 @@
-MINGW=/opt/mingw
+MINGW=/opt/mingw32
 export PATH=$PATH:$MINGW/bin
-#./configure --prefix=$MINGW --host=i586-mingw32 CC=$MINGW/bin/i586-mingw32-gcc CXX=$MINGW/bin/i586-mingw32-g++ DLLTOOL=$MINGW/bin/i586-mingw32-dlltool OBJDUMP=$MINGW/bin/i586-mingw32-objdump RANLIB=$MINGW/bin/i586-mingw32-ranlib AR=$MINGW/bin/i586-mingw32-ar AS=$MINGW/bin/i586-mingw32-as STRIP=$MINGW/bin/i586-mingw32-strip --with-qtdir=$MINGW --with-win32 CFLAGS="-mtune=generic -mmmx -fno-strict-aliasing" CXXFLAGS="-mtune=generic -mmmx -fno-strict-aliasing"
-#./configure --prefix=$MINGW --host=i586-mingw32 --build=i586-mingw32 CC=$MINGW/bin/i586-mingw32-gcc CXX=$MINGW/bin/i586-mingw32-g++ --with-qtdir=$MINGW --with-win32
-
-cmake . -DCMAKE_TOOLCHAIN_FILE=cmake/modules/Win32Toolchain.cmake
+cmake .. -DCMAKE_TOOLCHAIN_FILE=cmake/modules/Win32Toolchain.cmake
 

cmake/modules/Win32Toolchain.cmake

@@ -1,26 +1,28 @@
+SET(MINGW_PREFIX /opt/mingw32)
+
 # this one is important
 SET(CMAKE_SYSTEM_NAME Windows)
 #this one not so much
 SET(CMAKE_SYSTEM_VERSION 1)
 
 SET(CMAKE_SYSTEM_PROCESSOR i686)
-SET(CMAKE_INSTALL_PREFIX /opt/mingw32)
+SET(CMAKE_INSTALL_PREFIX ${MINGW_PREFIX})
 
-SET(CC_PREFIX /opt/mingw32)
 
 # specify the cross compiler
-SET(CMAKE_C_COMPILER   ${CC_PREFIX}/bin/i586-pc-mingw32-gcc)
-SET(CMAKE_CXX_COMPILER ${CC_PREFIX}/bin/i586-pc-mingw32-g++)
+SET(CMAKE_C_COMPILER   ${MINGW_PREFIX}/bin/i586-pc-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER ${MINGW_PREFIX}/bin/i586-pc-mingw32-g++)
 
 # where is the target environment 
 SET(CMAKE_FIND_ROOT_PATH  /opt/mingw32)
 
-SET(QT_BINARY_DIR   ${CC_PREFIX}/bin)
-SET(QT_LIBRARY_DIR  ${CC_PREFIX}/lib)
-SET(QT_QTCORE_LIBRARY   ${CC_PREFIX}/lib/libQtCore4.a)
-SET(QT_INCLUDE_DIR ${CC_PREFIX}/include/qt4)
-SET(QT_QTCORE_INCLUDE_DIR ${CC_PREFIX}/include/qt4/QtCore)
-SET(QT_MKSPECS_DIR  ${CC_PREFIX}/share/qt4/mkspecs)
+SET(QT_BINARY_DIR   ${MINGW_PREFIX}/bin)
+SET(QT_LIBRARY_DIR  ${MINGW_PREFIX}/lib)
+SET(QT_QTCORE_LIBRARY   ${MINGW_PREFIX}/lib/libQtCore4.a)
+SET(QT_INCLUDE_DIR ${MINGW_PREFIX}/include/qt4)
+SET(QT_HEADERS_DIR ${MINGW_PREFIX}/include/qt4)
+SET(QT_QTCORE_INCLUDE_DIR ${MINGW_PREFIX}/include/qt4/QtCore)
+SET(QT_MKSPECS_DIR  ${MINGW_PREFIX}/share/qt4/mkspecs)
 SET(QT_MOC_EXECUTABLE  ${QT_BINARY_DIR}/moc.exe)
 SET(QT_RCC_EXECUTABLE  ${QT_BINARY_DIR}/rcc.exe)
 SET(QT_QMAKE_EXECUTABLE  /usr/bin/qmake)
@@ -32,8 +34,8 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
-SET(PKG_CONFIG_EXECUTABLE ${CC_PREFIX}/bin/pkg-config)
+SET(PKG_CONFIG_EXECUTABLE ${MINGW_PREFIX}/bin/pkg-config)
 
-INCLUDE_DIRECTORIES(${CC_PREFIX}/include)
-LINK_DIRECTORIES(${CC_PREFIX}/lib ${CC_PREFIX}/bin)
+INCLUDE_DIRECTORIES(${MINGW_PREFIX}/include)
+LINK_DIRECTORIES(${MINGW_PREFIX}/lib ${MINGW_PREFIX}/bin)
 

data/presets/CMakeLists.txt

@@ -1,4 +1,5 @@
 INCLUDE(InstallHelpers)
 
 INSTALL_DATA_SUBDIRS("presets" "*.xpf")
+INSTALL_DATA_SUBDIRS("presets" "*.xiz")