finally made 0.3.0 release

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@538 0778d3d1-df1d-0410-868b-ea421aaaa00d

COPYING

@@ -1,8 +1,8 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
     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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

INSTALL

@@ -1,3 +1,13 @@
+Quick Instructions
+==================
+
+   Go to the directory containing the package's source code and type:
+
+     autoreconf -is
+     ./configure
+     make install
+     lmms
+
 Basic Installation
 ==================
 

Makefile.am

@@ -35,7 +35,7 @@ AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS)
 	$(MOC) -o $@ $<
 
 %.ts: 
-	$(LUPDATE) $(lmms_SOURCES) `find plugins/ -type f -name *.cpp` -ts data/locale/$@
+	$(LUPDATE) $(lmms_SOURCES) `find plugins/ -type f -name "*.cpp"` -ts data/locale/$@
 
 %.qm: %.ts
 	$(LRELEASE) $<
@@ -58,6 +58,10 @@ lmms_MOC =						\
 		./combobox.moc				\
 		./config_mgr.moc			\
 		./cpuload_widget.moc			\
+		./effect_control_dialog.moc		\
+		./effect_label.moc			\
+		./effect_select_dialog.moc		\
+		./effect_tab_widget.moc			\
 		./envelope_and_lfo_widget.moc		\
 		./envelope_tab_widget.moc		\
 		./export_project_dialog.moc		\
@@ -73,19 +77,22 @@ lmms_MOC =						\
 		./mixer.moc				\
 		./name_label.moc			\
 		./nstate_button.moc			\
+		./meter_dialog.moc			\
 		./midi_alsa_seq.moc			\
 		./midi_tab_widget.moc			\
-		./note_play_handle.moc			\
 		./pattern.moc				\
 		./piano_roll.moc			\
 		./piano_widget.moc			\
 		./pixmap_button.moc			\
 		./plugin_browser.moc			\
 		./project_notes.moc			\
+		./rack_plugin.moc			\
+		./rack_view.moc				\
 		./rubberband.moc			\
 		./qxembed.moc				\
 		./rename_dialog.moc			\
 		./sample_buffer.moc			\
+		./sample_play_handle.moc		\
 		./sample_track.moc			\
 		./setup_dialog.moc			\
 		./side_bar.moc				\
@@ -109,11 +116,28 @@ BUILT_SOURCES = $(lmms_MOC)
 lmms_EMBEDDED_RESOURCES = $(srcdir)/AUTHORS $(srcdir)/COPYING
 
 ./embedded_resources.h: $(lmms_EMBEDDED_RESOURCES)
-	$(top_builddir)/buildtools/bin2res $(lmms_EMBEDDED_RESOURCES) > $@
+	$(BIN2RES) $(lmms_EMBEDDED_RESOURCES) > $@
 
 ./embed.o: ./embedded_resources.h
 
 
+if USE_3RDPARTY_LIBSRC
+LIBSAMPLERATE_SOURCES=	$(srcdir)/src/3rdparty/samplerate/samplerate.c		\
+			$(srcdir)/src/3rdparty/samplerate/samplerate.h		\
+			$(srcdir)/src/3rdparty/samplerate/src_sinc.c		\
+			$(srcdir)/src/3rdparty/samplerate/high_qual_coeffs.h	\
+			$(srcdir)/src/3rdparty/samplerate/mid_qual_coeffs.h	\
+			$(srcdir)/src/3rdparty/samplerate/fastest_coeffs.h	\
+			$(srcdir)/src/3rdparty/samplerate/common.h		\
+			$(srcdir)/src/3rdparty/samplerate/float_cast.h		\
+			$(srcdir)/src/3rdparty/samplerate/src_zoh.c		\
+			$(srcdir)/src/3rdparty/samplerate/src_linear.c
+endif
+
+THIRD_PARTY_CODE=$(LIBSAMPLERATE_SOURCES)
+
+
+
 lmms_SOURCES =								\
 		$(srcdir)/src/audio/audio_alsa.cpp			\
 		$(srcdir)/src/audio/audio_device.cpp			\
@@ -128,8 +152,14 @@ lmms_SOURCES =								\
 		$(srcdir)/src/core/about_dialog.cpp			\
 		$(srcdir)/src/core/arp_and_chords_tab_widget.cpp	\
 		$(srcdir)/src/core/automation_editor.cpp		\
+		$(srcdir)/src/core/automation_pattern.cpp		\
 		$(srcdir)/src/core/bb_editor.cpp			\
 		$(srcdir)/src/core/config_mgr.cpp			\
+		$(srcdir)/src/core/effect_chain.cpp			\
+		$(srcdir)/src/core/effect_control_dialog.cpp		\
+		$(srcdir)/src/core/effect_select_dialog.cpp		\
+		$(srcdir)/src/core/effect_tab_widget.cpp		\
+		$(srcdir)/src/core/effect.cpp				\
 		$(srcdir)/src/core/engine.cpp				\
 		$(srcdir)/src/core/envelope_and_lfo_widget.cpp		\
 		$(srcdir)/src/core/envelope_tab_widget.cpp		\
@@ -139,6 +169,7 @@ lmms_SOURCES =								\
 		$(srcdir)/src/core/instrument.cpp			\
 		$(srcdir)/src/core/main_window.cpp			\
 		$(srcdir)/src/core/main.cpp				\
+		$(srcdir)/src/core/meter_dialog.cpp			\
 		$(srcdir)/src/core/midi_tab_widget.cpp			\
 		$(srcdir)/src/core/mixer.cpp				\
 		$(srcdir)/src/core/name_label.cpp			\
@@ -152,17 +183,17 @@ lmms_SOURCES =								\
 		$(srcdir)/src/core/sample_play_handle.cpp		\
 		$(srcdir)/src/core/setup_dialog.cpp			\
 		$(srcdir)/src/core/song_editor.cpp			\
+		$(srcdir)/src/core/tool.cpp				\
 		$(srcdir)/src/core/track.cpp				\
 		$(srcdir)/src/core/track_container.cpp			\
 		$(srcdir)/src/core/surround_area.cpp			\
 		$(srcdir)/src/core/timeline.cpp				\
 		$(srcdir)/src/lib/base64.cpp				\
-		$(srcdir)/src/lib/buffer_allocator.cpp			\
 		$(srcdir)/src/lib/clipboard.cpp				\
 		$(srcdir)/src/lib/journalling_object.cpp		\
 		$(srcdir)/src/lib/project_journal.cpp			\
+		$(srcdir)/src/lib/project_version.cpp			\
 		$(srcdir)/src/lib/embed.cpp				\
-		$(srcdir)/src/lib/ladspa_manager.cpp			\
 		$(srcdir)/src/lib/mmp.cpp				\
 		$(srcdir)/src/lib/oscillator.cpp			\
 		$(srcdir)/src/lib/sample_buffer.cpp			\
@@ -173,7 +204,6 @@ lmms_SOURCES =								\
 		$(srcdir)/src/midi/midi_mapper.cpp			\
 		$(srcdir)/src/midi/midi_oss.cpp				\
 		$(srcdir)/src/midi/midi_port.cpp			\
-		$(srcdir)/src/tracks/automation_pattern.cpp		\
 		$(srcdir)/src/tracks/automation_track.cpp		\
 		$(srcdir)/src/tracks/bb_track.cpp			\
 		$(srcdir)/src/tracks/instrument_track.cpp		\
@@ -183,6 +213,7 @@ lmms_SOURCES =								\
 		$(srcdir)/src/widgets/automatable_slider.cpp		\
 		$(srcdir)/src/widgets/combobox.cpp			\
 		$(srcdir)/src/widgets/cpuload_widget.cpp		\
+		$(srcdir)/src/widgets/effect_label.cpp			\
 		$(srcdir)/src/widgets/fade_button.cpp			\
 		$(srcdir)/src/widgets/group_box.cpp			\
 		$(srcdir)/src/widgets/kmultitabbar.cpp			\
@@ -192,6 +223,8 @@ lmms_SOURCES =								\
 		$(srcdir)/src/widgets/nstate_button.cpp			\
 		$(srcdir)/src/widgets/pixmap_button.cpp			\
 		$(srcdir)/src/widgets/project_notes.cpp			\
+		$(srcdir)/src/widgets/rack_plugin.cpp			\
+		$(srcdir)/src/widgets/rack_view.cpp			\
 		$(srcdir)/src/widgets/rubberband.cpp			\
 		$(srcdir)/src/widgets/qxembed.cpp			\
 		$(srcdir)/src/widgets/rename_dialog.cpp			\
@@ -205,8 +238,9 @@ lmms_SOURCES =								\
 		$(srcdir)/src/widgets/visualization_widget.cpp		\
 		$(srcdir)/src/widgets/volume_knob.cpp			\
 		$(srcdir)/src/lmms_single_source.cpp			\
-		$(srcdir)/include/pch.h					\
+		$(srcdir)/include/aeffectx.h				\
 		$(srcdir)/include/debug.h				\
+		$(srcdir)/include/detuning_helper.h			\
 		$(srcdir)/include/main_window.h				\
 		$(srcdir)/include/audio_alsa.h				\
 		$(srcdir)/include/audio_device.h			\
@@ -277,6 +311,7 @@ lmms_SOURCES =								\
 		$(srcdir)/include/midi_time.h				\
 		$(srcdir)/include/clipboard.h				\
 		$(srcdir)/include/types.h				\
+		$(srcdir)/include/update_event.h			\
 		$(srcdir)/include/qt3support.h				\
 		$(srcdir)/include/embed.h				\
 		$(srcdir)/include/timeline.h				\
@@ -285,6 +320,7 @@ lmms_SOURCES =								\
 		$(srcdir)/include/tab_bar.h				\
 		$(srcdir)/include/tab_button.h				\
 		$(srcdir)/include/project_notes.h			\
+		$(srcdir)/include/project_version.h			\
 		$(srcdir)/include/visualization_widget.h		\
 		$(srcdir)/include/endian_handling.h			\
 		$(srcdir)/include/preset_preview_play_handle.h		\
@@ -292,7 +328,6 @@ lmms_SOURCES =								\
 		$(srcdir)/include/nstate_button.h			\
 		$(srcdir)/include/midi_dummy.h				\
 		$(srcdir)/include/midi_mapper.h				\
-		$(srcdir)/include/buffer_allocator.h			\
 		$(srcdir)/include/lcd_spinbox.h				\
 		$(srcdir)/include/tooltip.h				\
 		$(srcdir)/include/automatable_button.h			\
@@ -306,24 +341,43 @@ lmms_SOURCES =								\
 		$(srcdir)/include/dummy_instrument.h			\
 		$(srcdir)/include/instrument_play_handle.h		\
 		$(srcdir)/include/string_pair_drag.h			\
-		$(srcdir)/include/ladspa_manager.h			\
 		$(srcdir)/include/midi_tab_widget.h			\
 		$(srcdir)/include/audio_port.h				\
+		$(srcdir)/include/tool.h				\
 		$(srcdir)/include/tool_button.h				\
 		$(srcdir)/include/cpuload_widget.h			\
+		$(srcdir)/include/custom_events.h			\
 		$(srcdir)/include/midi_alsa_seq.h			\
 		$(srcdir)/include/micro_timer.h				\
 		$(srcdir)/include/fade_button.h				\
+		$(srcdir)/include/fifo_buffer.h				\
 		$(srcdir)/include/combobox.h				\
 		$(srcdir)/include/rubberband.h				\
 		$(srcdir)/include/base64.h				\
 		$(srcdir)/include/automatable_object.h			\
+		$(srcdir)/include/automatable_object_templates.h	\
 		$(srcdir)/include/journalling_object.h			\
 		$(srcdir)/include/level_object.h			\
 		$(srcdir)/include/project_journal.h			\
+		$(srcdir)/include/shared_object.h			\
 		$(srcdir)/include/import_filter.h			\
 		$(srcdir)/include/engine.h				\
-		$(srcdir)/include/qxembed.h
+		$(srcdir)/include/effect.h				\
+		$(srcdir)/include/effect_chain.h			\
+		$(srcdir)/include/effect_control_dialog.h		\
+		$(srcdir)/include/effect_label.h			\
+		$(srcdir)/include/effect_tab_widget.h			\
+		$(srcdir)/include/rack_plugin.h				\
+		$(srcdir)/include/rack_view.h				\
+		$(srcdir)/include/effect_select_dialog.h		\
+		$(srcdir)/include/dummy_effect.h			\
+		$(srcdir)/include/ladspa-1.1.h				\
+		$(srcdir)/include/sweep_oscillator.h			\
+		$(srcdir)/include/meter_dialog.h			\
+		$(srcdir)/include/qxembed.h				\
+		$(srcdir)/include/effect_lib.h				\
+		$(srcdir)/include/xqmap.h				\
+		$(THIRD_PARTY_CODE)
 
 
 
@@ -352,7 +406,8 @@ if HAVE_LIBVORBIS
 LIB_VORBIS_LDADD = -lvorbis -lvorbisenc -lvorbisfile
 endif
 
-if HAVE_LIBSRC
+if USE_3RDPARTY_LIBSRC
+else
 LIB_SRC_LDADD = -lsamplerate
 endif
 
@@ -360,7 +415,13 @@ if HAVE_LIBSF
 LIB_SF_LDADD = -lsndfile
 endif
 
-lmms_LDADD = $(QT_LDADD) $(LIB_SDL_LDADD) $(LIB_ASOUND_LDADD) $(LIB_JACK_LDADD) $(LIB_SDL_SOUND_LDADD) $(LIB_VORBIS_LDADD) $(LIB_SRC_LDADD) $(LIB_SF_LDADD) $(LIB_FST_LDADD) -ldl
+if LADSPA_SUPPORT
+LIB_LADSPABASE_LDADD = -Lplugins/ladspa_base -lladspabase
+endif
+
+lmms_LDADD = $(QT_LDADD) $(LIB_SDL_LDADD) $(LIB_ASOUND_LDADD) $(LIB_JACK_LDADD) $(LIB_SDL_SOUND_LDADD) $(LIB_VORBIS_LDADD) $(LIB_SRC_LDADD) $(LIB_SF_LDADD) $(LIB_LADSPABASE_LDADD)
+if BUILD_LINUX
 lmms_LDFLAGS = -rdynamic
+endif
 #-rpath $(pkglibdir)
 

Makefile.svn

@@ -0,0 +1,22 @@
+all:
+	@echo
+	@echo Creating neccessary files for configuring and building LMMS
+	@echo
+	@echo \ \* Creating aclocal.m4
+	@aclocal
+	@echo \ \* Running libtoolize
+	@libtoolize -c -f
+	@echo \ \* Creating config.h.in
+	@autoheader
+	@echo \ \* Creating Makefile templates
+	@automake -ac
+	@echo \ \* Creating configure
+	@autoconf
+	@echo \ \* Cleaning up
+	@rm -rf autom4te.cache/
+	@echo
+	@echo ...done\! If something failed make sure you\'ve installed autoconf,
+	@echo automake and libtool.
+	@echo Otherwise you can run now configure \(if you did not so far\) and then make.
+	@echo
+

README

@@ -1,7 +1,7 @@
-Linux MultiMedia Studio 0.1.4
+Linux MultiMedia Studio 0.3.0
 ==============================
 
-Copyright (c) 2004-2006 by Tobias Doerffel and others.
+Copyright (c) 2004-2007 by LMMS-developers
 
 
 This program is free software; you can redistribute it and/or modify 
@@ -14,9 +14,9 @@ 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., 59 Temple
-Place - Suite 330, Boston, MA  02111-1307, USA
+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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 
@@ -47,8 +47,8 @@ least 500 MHz, but for really enjoying LMMS less than 1 GHz makes no sense...
 
 Required libraries:
 
-- multithreaded version of Qt 3.0 (at least 3.2 recommended) or higher (tested
-  up to 4.1.0) with devel-files
+- multithreaded version of Qt 3.0 (at least 3.2 recommended) or higher with
+  devel-files
 
 Optional, but strongly recommended:
 - JACK with devel-files
@@ -58,12 +58,11 @@ Optional, but strongly recommended:
 - SDL with devel-files
 - libsamplerate with devel-files
 - libsndfile with devel-files
-- WINE, WINE-devel-files + header-files from Steinberg SDK
+- WINE + WINE-devel-files
+- stk, libstk + libstk-dev
+- festival-devel-files and default-voice
 
 For compiling you should have an up to date GCC with g++.
-LMMS has been (successfully) tested under Debian Sarge 3.1 / unstable,
-Fedora Core 2-4, and SuSE Linux 9.0-9.3 with Qt 3.[23].x and Qt 4.0.0.
-It was compiled using GCC 2.95, 3.3.x, GCC 3.4.x and GCC 4.0.x.
 
 If you have problems with compiling or running LMMS, find any bug or have
 suggestions and so on, please feel free to e-mail me (for mail-address see
@@ -105,10 +104,10 @@ http://lmms.sourceforge.net/development.php
 
 or in the Wiki:
 
-http://wiki.mindrules.net
+http://lmms.sourceforge.net/wiki/
 
 Before coding a new big feature, please ALWAYS post your idea and suggestions
 about your feature and about the intended implementation to the
 LMMS-devel-mailinglist (lmms-devel@lists.sourceforge.net) and wait for replies!
 Maybe there're different ideas, improvements, hints or maybe your feature is
-not welcome/needed at the moment (but for sure this will be very seldom).
+not welcome/needed at the moment.

TODO

@@ -1,11 +1,14 @@
-- do not duplicate recorded notes when clicking on them
+- do not process effects when playing frozen patterns
+- select number of channels in export-project-dialog
+- MIDI over Ethernet support
+- 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
-- font-size-scaling-coefficient in setup-dialog
 - make note able of journalling
 - before calling undoStep/redoStep from journallingObject, save journalling-state-context and disabled journalling, restore afterwards
 - intelligent journal-entry-merging
@@ -17,18 +20,15 @@
 - add support for panes-interface (like blender) (instead of MDI etc.)
 - message to user when importing unsupported MIDI-file (track-count = 0)
 - AMS/OMS-bindings
-- remove binary-embed-system
+- remove binary-embed-system (Qt4-resource-system?)
 - recording-functionality
-- show loading-vst-hint when cloning vestige-track
 - 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
-- do not quantize when importing from MIDI-file
 - separate GUI and data/sound-processing-code
 - make color-scheme switchable: LMMS / user
 - 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 channel-track
-- do not skip samples because of rounding-errors when resampling in src/lib/sample_buffer.cpp
+- 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
@@ -36,10 +36,8 @@
 - pre-listen when opening sample with QFileDialog
 - panning-editing in piano-roll
 - speed up painting of sampleTCO
-- solve problems with different keyboard-layouts when playing channel-track with pc-keyboard -> use tr()
 - panning env+lfo
 - rewrite export-project-dialog using layout-mechanism
-- dynamic pitch-change
 - make piano-roll use the global clipboard??
 - add more localizations:
 	- Swedish

acinclude.m4

@@ -9,13 +9,13 @@ AC_ARG_WITH([qtdir], [  --with-qtdir=DIR        Qt installation directory [defau
 # Check that QTDIR is defined or that --with-qtdir given
 if test x"$QTDIR" = x ; then
 	# some usual Qt-locations
-	QT_SEARCH="/usr /usr/lib/qt /usr/lib/qt3 /usr/lib/qt31 /usr/lib/qt32 /usr/lib/qt33 /usr/lib/qt-3.0 /usr/lib/qt-3.1 /usr/lib/qt-3.2 /usr/lib/qt-3.3 /usr/local/qt /usr/local/qt3 /usr/local/qt31 /usr/local/qt32 /usr/local/qt33 /usr/share/qt3 /usr/X11R6 /usr/share/qt4 /usr/local/Trolltech/Qt-4.0.0 /usr/local/Trolltech/Qt-4.0.1 /usr/local/Trolltech/Qt-4.1.0 /usr/local/Trolltech/Qt-4.1.0"
+	QT_SEARCH="/usr /usr/lib/qt /usr/lib/qt3 /usr/lib/qt31 /usr/lib/qt32 /usr/lib/qt33 /usr/lib/qt-3.0 /usr/lib/qt-3.1 /usr/lib/qt-3.2 /usr/lib/qt-3.3 /usr/local/qt /usr/local/qt3 /usr/local/qt31 /usr/local/qt32 /usr/local/qt33 /usr/share/qt3 /usr/X11R6" # /usr/share/qt4 /usr/local/Trolltech/Qt-4.0.0 /usr/local/Trolltech/Qt-4.0.1 /usr/local/Trolltech/Qt-4.1.0 /usr/local/Trolltech/Qt-4.1.0"
 else
 	QT_SEARCH=$QTDIR
 	QTDIR=""
 fi
 for i in $QT_SEARCH ; do
-	QT_INCLUDE_SEARCH="include include/qt include/qt3 include/Qt"
+	QT_INCLUDE_SEARCH="include include/qt include/qt3" # include/qt4/Qt include/Qt"
 	for j in $QT_INCLUDE_SEARCH ; do
 	        if test -f $i/$j/qglobal.h -a x$QTDIR = x ; then
 			QTDIR=$i
@@ -51,9 +51,9 @@ case "${QT_VER}" in
     3*)
         QT_MAJOR="3"
     ;;
-    4*)
-	QT_MAJOR="4"
-    ;;
+#    4*)
+#	QT_MAJOR="4"
+#    ;;
     *)
         AC_MSG_ERROR([*** Don't know how to handle this Qt major version])
     ;;
@@ -61,6 +61,7 @@ esac
 AC_MSG_RESULT([$QT_VER ($QT_MAJOR)])
 
 # Search for available Qt translations
+AH_TEMPLATE(QT_TRANSLATIONS_DIR, [Define to Qt translations directory])
 AC_MSG_CHECKING([Qt translations])
 case "${QT_VER}" in
     3*)
@@ -77,15 +78,22 @@ for i in $QT_TRANSLATIONS_SEARCH ; do
 done
 if test x"$QT_TRANSLATIONS" = x ; then
     AC_MSG_WARN([*** not found! You may want to install a Qt i18n package])
+else
+    AC_DEFINE_UNQUOTED(QT_TRANSLATIONS_DIR, "$QT_TRANSLATIONS")
 fi
 AC_MSG_RESULT([$QT_TRANSLATIONS])
 
+QTHOSTDIR=/usr
+
 # Check that moc is in path
 AC_CHECK_PROG(MOC, moc, $QTDIR/bin/moc,,$QTDIR/bin/)
 if test x$MOC = x ; then
 	AC_CHECK_PROG(MOC, moc-qt3, $QTDIR/bin/moc-qt3,,$QTDIR/bin/)
 	if test x$MOC = x ; then
-        	AC_MSG_ERROR([*** not found! Make sure you have Qt-devel-tools installed!])
+		AC_CHECK_PROG(MOC, moc-qt4, $QTHOSTDIR/bin/moc-qt4,,$QTHOSTDIR/bin/)
+		if test x$MOC = x ; then
+        		AC_MSG_ERROR([*** not found! Make sure you have Qt-devel-tools installed!])
+		fi
 	fi
 fi
 
@@ -110,7 +118,7 @@ fi
 # Calculate Qt include path
 QT_CXXFLAGS="-I$QT_INCLUDES"
 if test "$QT_MAJOR" = "4" ; then
-	QT_CXXFLAGS="$QT_CXXFLAGS -I$QTDIR/include"
+	QT_CXXFLAGS="$QT_CXXFLAGS -I$QTDIR/include/qt4 -I$QTDIR/include"
 fi
 
 
@@ -138,6 +146,10 @@ case "${host}" in
         fi
         ;;
 
+      *mingw32)
+	QT_IS_MT="yes"
+	QT_LIB="-L$QTDIR/bin -lQtCore4 -lQtGui4 -lQtXml4 -lQt3Support4"
+        ;;
     *)
         QT_IS_STATIC=`ls $QTDIR/lib/*.a 2> /dev/null`
        	if test "x$QT_IS_STATIC" = x; then
@@ -157,6 +169,7 @@ case "${host}" in
 	if test "$QT_MAJOR" = "4" ; then
 		QT_IS_MT="yes"
 		QT_LIB="-lQtCore -lQtGui -lQtXml -lQt3Support"
+		MOC="$MOC -DLADSPA_SUPPORT"
 	else
         	QT_CXXFLAGS="-DQT3 $QT_CXXFLAGS"
 	        if test "x`ls $QTDIR/lib/libqt-mt.* 2> /dev/null`" != x ; then
@@ -260,11 +273,7 @@ fi
 
 if test x"$QT_IS_MT" = "xyes" ; then
         QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -DQT_THREAD_SUPPORT"
-	QT_LIBS="$QT_LIBS -lpthread"
-fi
-
-if test x"$QT_TRANSLATIONS" != x ; then
-    QT_CXXFLAGS="$QT_CXXFLAGS -DQT_TRANSLATIONS_DIR='\"$QT_TRANSLATIONS\"'"
+	QT_LIBS="$QT_LIBS"
 fi
 
 QT_LDADD="-L$QTDIR/lib $QT_LIBS"
@@ -288,3 +297,396 @@ AC_SUBST(QASSISTANTCLIENT_LDADD)
 
 ])
 
+
+
+dnl @synopsis AC_C_FIND_ENDIAN
+dnl
+dnl Determine endian-ness of target processor.
+dnl @version 1.1	Mar 03 2002
+dnl @author Erik de Castro Lopo <erikd AT mega-nerd DOT com>
+dnl
+dnl Majority written from scratch to replace the standard autoconf macro 
+dnl AC_C_BIGENDIAN. Only part remaining from the original it the invocation
+dnl of the AC_TRY_RUN macro.
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this file for any 
+dnl purpose is hereby granted without fee, provided that the above copyright 
+dnl and this permission notice appear in all copies.  No representations are
+dnl made about the suitability of this software for any purpose.  It is 
+dnl provided "as is" without express or implied warranty.
+
+dnl Find endian-ness in the following way:
+dnl    1) Look in <endian.h>.
+dnl    2) If 1) fails, look in <sys/types.h> and <sys/param.h>.
+dnl    3) If 1) and 2) fails and not cross compiling run a test program.
+dnl    4) If 1) and 2) fails and cross compiling then guess based on target.
+
+AC_DEFUN([AC_C_FIND_ENDIAN],
+[AC_CACHE_CHECK(processor byte ordering, 
+	ac_cv_c_byte_order,
+
+# Initialize to unknown
+ac_cv_c_byte_order=unknown
+
+if test x$ac_cv_header_endian_h = xyes ; then
+
+	# First try <endian.h> which should set BYTE_ORDER.
+
+	[AC_TRY_LINK([
+		#include <endian.h>
+		#if BYTE_ORDER != LITTLE_ENDIAN
+			not big endian
+		#endif
+		], return 0 ;, 
+			ac_cv_c_byte_order=little
+		)]
+				
+	[AC_TRY_LINK([
+		#include <endian.h>
+		#if BYTE_ORDER != BIG_ENDIAN
+			not big endian
+		#endif
+		], return 0 ;, 
+			ac_cv_c_byte_order=big
+		)]
+
+	fi
+
+if test $ac_cv_c_byte_order = unknown ; then
+
+	[AC_TRY_LINK([
+		#include <sys/types.h>
+		#include <sys/param.h>
+		#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+			bogus endian macros
+		#endif
+		], return 0 ;, 
+
+		[AC_TRY_LINK([
+			#include <sys/types.h>
+			#include <sys/param.h>
+			#if BYTE_ORDER != LITTLE_ENDIAN
+				not big endian
+			#endif
+			], return 0 ;, 
+				ac_cv_c_byte_order=little
+			)]
+				
+		[AC_TRY_LINK([
+			#include <sys/types.h>
+			#include <sys/param.h>
+			#if BYTE_ORDER != LITTLE_ENDIAN
+				not big endian
+			#endif
+			], return 0 ;, 
+				ac_cv_c_byte_order=little
+			)]
+
+		)]
+
+ 	fi
+
+if test $ac_cv_c_byte_order = unknown ; then
+	if test $cross_compiling = yes ; then
+		# This is the last resort. Try to guess the target processor endian-ness
+		# by looking at the target CPU type.	
+		[
+		case "$target_cpu" in
+			alpha* | i?86* | mipsel* | ia64*)
+				ac_cv_c_big_endian=0
+				ac_cv_c_little_endian=1
+				;;
+			
+			m68* | mips* | powerpc* | hppa* | sparc*)
+				ac_cv_c_big_endian=1
+				ac_cv_c_little_endian=0
+				;;
+	
+			esac
+		]
+	else
+		AC_TRY_RUN(
+		[[
+		int main (void) 
+		{	/* Are we little or big endian?  From Harbison&Steele.  */
+			union
+			{	long l ;
+				char c [sizeof (long)] ;
+			} u ;
+			u.l = 1 ;
+			return (u.c [sizeof (long) - 1] == 1);
+			}
+			]], , ac_cv_c_byte_order=big, 
+			ac_cv_c_byte_order=unknown
+			)
+
+		AC_TRY_RUN(
+		[[int main (void) 
+		{	/* Are we little or big endian?  From Harbison&Steele.  */
+			union
+			{	long l ;
+				char c [sizeof (long)] ;
+			} u ;
+			u.l = 1 ;
+			return (u.c [0] == 1);
+			}]], , ac_cv_c_byte_order=little, 
+			ac_cv_c_byte_order=unknown
+			)
+		fi	
+	fi
+
+)
+]
+
+if test $ac_cv_c_byte_order = big ; then
+	ac_cv_c_big_endian=1
+	ac_cv_c_little_endian=0
+elif test $ac_cv_c_byte_order = little ; then
+	ac_cv_c_big_endian=0
+	ac_cv_c_little_endian=1
+else
+	ac_cv_c_big_endian=0
+	ac_cv_c_little_endian=0
+
+	AC_MSG_WARN([[*****************************************************************]])
+	AC_MSG_WARN([[*** Not able to determine endian-ness of target processor.       ]])
+	AC_MSG_WARN([[*** The constants CPU_IS_BIG_ENDIAN and CPU_IS_LITTLE_ENDIAN in  ]])
+	AC_MSG_WARN([[*** src/config.h may need to be hand editied.                    ]])
+	AC_MSG_WARN([[*****************************************************************]])
+	fi
+
+)# AC_C_FIND_ENDIAN
+
+dnl @synopsis AC_C99_FUNC_LRINT
+dnl
+dnl Check whether C99's lrint function is available.
+dnl @version 1.3	Feb 12 2002
+dnl @author Erik de Castro Lopo <erikd AT mega-nerd DOT com>
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this file for any 
+dnl purpose is hereby granted without fee, provided that the above copyright 
+dnl and this permission notice appear in all copies.  No representations are
+dnl made about the suitability of this software for any purpose.  It is 
+dnl provided "as is" without express or implied warranty.
+dnl
+AC_DEFUN([AC_C99_FUNC_LRINT],
+[AC_CACHE_CHECK(for lrint,
+  ac_cv_c99_lrint,
+[
+lrint_save_CFLAGS=$CFLAGS
+CFLAGS="-O2 -lm"
+AC_TRY_LINK([
+#define		_ISOC9X_SOURCE	1
+#define 	_ISOC99_SOURCE	1
+#define		__USE_ISOC99	1
+#define 	__USE_ISOC9X	1
+
+#include <math.h>
+], if (!lrint(3.14159)) lrint(2.7183);, ac_cv_c99_lrint=yes, ac_cv_c99_lrint=no)
+
+CFLAGS=$lrint_save_CFLAGS
+
+])
+
+if test "$ac_cv_c99_lrint" = yes; then
+  AC_DEFINE(HAVE_LRINT, 1,
+            [Define if you have C99's lrint function.])
+fi
+])# AC_C99_FUNC_LRINT
+dnl @synopsis AC_C99_FUNC_LRINTF
+dnl
+dnl Check whether C99's lrintf function is available.
+dnl @version 1.3	Feb 12 2002
+dnl @author Erik de Castro Lopo <erikd AT mega-nerd DOT com>
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this file for any 
+dnl purpose is hereby granted without fee, provided that the above copyright 
+dnl and this permission notice appear in all copies.  No representations are
+dnl made about the suitability of this software for any purpose.  It is 
+dnl provided "as is" without express or implied warranty.
+dnl
+AC_DEFUN([AC_C99_FUNC_LRINTF],
+[AC_CACHE_CHECK(for lrintf,
+  ac_cv_c99_lrintf,
+[
+lrintf_save_CFLAGS=$CFLAGS
+CFLAGS="-O2 -lm"
+AC_TRY_LINK([
+#define		_ISOC9X_SOURCE	1
+#define 	_ISOC99_SOURCE	1
+#define		__USE_ISOC99	1
+#define 	__USE_ISOC9X	1
+
+#include <math.h>
+], if (!lrintf(3.14159)) lrintf(2.7183);, ac_cv_c99_lrintf=yes, ac_cv_c99_lrintf=no)
+
+CFLAGS=$lrintf_save_CFLAGS
+
+])
+
+if test "$ac_cv_c99_lrintf" = yes; then
+  AC_DEFINE(HAVE_LRINTF, 1,
+            [Define if you have C99's lrintf function.])
+fi
+])# AC_C99_FUNC_LRINTF
+dnl @synopsis AC_C99_FUNC_LLRINT
+dnl
+dnl Check whether C99's llrint function is available.
+dnl @version 1.1	Sep 30 2002
+dnl @author Erik de Castro Lopo <erikd AT mega-nerd DOT com>
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this file for any 
+dnl purpose is hereby granted without fee, provided that the above copyright 
+dnl and this permission notice appear in all copies.  No representations are
+dnl made about the suitability of this software for any purpose.  It is 
+dnl provided "as is" without express or implied warranty.
+dnl
+AC_DEFUN([AC_C99_FUNC_LLRINT],
+[AC_CACHE_CHECK(for llrint,
+  ac_cv_c99_llrint,
+[
+llrint_save_CFLAGS=$CFLAGS
+CFLAGS="-O2 -lm"
+AC_TRY_LINK([
+#define		_ISOC9X_SOURCE	1
+#define 	_ISOC99_SOURCE	1
+#define		__USE_ISOC99	1
+#define 	__USE_ISOC9X	1
+
+#include <math.h>
+#include <stdint.h>
+], int64_t	x ; x = llrint(3.14159) ;, ac_cv_c99_llrint=yes, ac_cv_c99_llrint=no)
+
+CFLAGS=$llrint_save_CFLAGS
+
+])
+
+if test "$ac_cv_c99_llrint" = yes; then
+  AC_DEFINE(HAVE_LLRINT, 1,
+            [Define if you have C99's llrint function.])
+fi
+])# AC_C99_FUNC_LLRINT
+
+
+
+dnl @synopsis AC_C_CLIP_MODE
+dnl
+dnl Determine the clipping mode when converting float to int.
+dnl @version 1.0	May 17 2003
+dnl @author Erik de Castro Lopo <erikd AT mega-nerd DOT com>
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this file for any 
+dnl purpose is hereby granted without fee, provided that the above copyright 
+dnl and this permission notice appear in all copies.  No representations are
+dnl made about the suitability of this software for any purpose.  It is 
+dnl provided "as is" without express or implied warranty.
+
+
+
+dnl Find the clipping mode in the following way:
+dnl    1) If we are not cross compiling test it.
+dnl    2) IF we are cross compiling, assume that clipping isn't done correctly.
+
+AC_DEFUN([AC_C_CLIP_MODE],
+[AC_CACHE_CHECK(processor clipping capabilities, 
+	ac_cv_c_clip_type,
+
+# Initialize to unknown
+ac_cv_c_clip_positive=unknown
+ac_cv_c_clip_negative=unknown
+
+if test $ac_cv_c_clip_positive = unknown ; then
+	AC_TRY_RUN(
+	[[
+	#define	_ISOC9X_SOURCE	1
+	#define _ISOC99_SOURCE	1
+	#define	__USE_ISOC99	1
+	#define __USE_ISOC9X	1
+	#include <math.h>
+	int main (void)
+	{	double	fval ;
+		int k, ival ;
+
+		fval = 1.0 * 0x7FFFFFFF ;
+		for (k = 0 ; k < 100 ; k++)
+		{	ival = (lrint (fval)) >> 24 ;
+			if (ival != 127)
+				return 1 ;
+		
+			fval *= 1.2499999 ;
+			} ;
+		
+			return 0 ;
+		}
+		]],
+		ac_cv_c_clip_positive=yes,
+		ac_cv_c_clip_positive=no,
+		ac_cv_c_clip_positive=unknown
+		)
+
+	AC_TRY_RUN(
+	[[
+	#define	_ISOC9X_SOURCE	1
+	#define _ISOC99_SOURCE	1
+	#define	__USE_ISOC99	1
+	#define __USE_ISOC9X	1
+	#include <math.h>
+	int main (void)
+	{	double	fval ;
+		int k, ival ;
+
+		fval = -8.0 * 0x10000000 ;
+		for (k = 0 ; k < 100 ; k++)
+		{	ival = (lrint (fval)) >> 24 ;
+			if (ival != -128)
+				return 1 ;
+		
+			fval *= 1.2499999 ;
+			} ;
+		
+			return 0 ;
+		}
+		]],
+		ac_cv_c_clip_negative=yes,
+		ac_cv_c_clip_negative=no,
+		ac_cv_c_clip_negative=unknown
+		)
+
+	fi
+
+if test $ac_cv_c_clip_positive = yes ; then
+	ac_cv_c_clip_positive=1
+else
+	ac_cv_c_clip_positive=0
+	fi
+
+if test $ac_cv_c_clip_negative = yes ; then
+	ac_cv_c_clip_negative=1
+else
+	ac_cv_c_clip_negative=0
+	fi
+
+[[
+case "$ac_cv_c_clip_positive$ac_cv_c_clip_negative" in
+	"00")
+		ac_cv_c_clip_type="none"
+		;;
+	"10")
+		ac_cv_c_clip_type="positive"
+		;;
+	"01")
+		ac_cv_c_clip_type="negative"
+		;;
+	"11")
+		ac_cv_c_clip_type="both"
+		;;
+	esac
+	]]
+
+)
+]
+
+)# AC_C_CLIP_MODE
+
+
+

buildtools/bin2res.cpp

@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 

configure.in

@@ -2,32 +2,68 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(lmms, 0.2.1, tobydox/at/users/dot/sourceforge/dot/net)
-AM_INIT_AUTOMAKE(lmms, 0.2.1)
+AC_INIT(lmms, 0.3.0, lmms-devel/at/lists/dot/sf/dot/net)
+AM_INIT_AUTOMAKE(lmms, 0.3.0)
 
 AM_CONFIG_HEADER(config.h)
 
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
+AC_LIBTOOL_WIN32_DLL
 AC_PROG_LN_S
 AC_PROG_GCC_TRADITIONAL
-AC_PROG_LIBTOOL
+AM_PROG_LIBTOOL
+
+if ! test -z "${prefix}" -o "${prefix}" = "NONE" ; then
+	CFLAGS="$CFLAGS -I${prefix}/include"
+	CPPFLAGS="$CPPFLAGS -I${prefix}/include"
+	LDFLAGS="$LDFLAGS -L${prefix}/bin"
+fi
+
+AH_TEMPLATE(BUILD_LINUX, [Build LMMS for Linux])
+AH_TEMPLATE(BUILD_WIN32, [Build LMMS for Win32])
+AC_ARG_WITH(linux,
+	[  --with-linux		explicit build LMMS for Linux], [ build_linux=true ], [ build_linux=false ])
+AC_ARG_WITH(win32,
+	[  --with-win32		explicit build LMMS for Win32], [ build_win32=true ], [ build_win32=false ])
+AC_MSG_CHECKING([platform to build for])
+if test "x$build_win32" = "xtrue" ; then
+	AC_MSG_RESULT([Win32, will enable support for it])
+	AC_DEFINE(BUILD_WIN32)
+	AC_DEFINE(WIN32)
+	build_linux="false"
+	build_win32="true"
+else
+#	if test `uname -s | tr -s 'LINUX' 'linux'` = "linux" -o "x$build_linux" = "xyes" ; then
+		AC_MSG_RESULT([Linux, will enable support for it])
+		AC_DEFINE(BUILD_LINUX)
+		build_linux="true"
+		build_win32="false"
+#	if uname -s | grep MINGW32 ; then
+#	else
+#		AC_MSG_ERROR([*** non usable found... Run ./configure --help to see a list of available platforms, you can also specify explicit, if your platform was not recognized properly. Otherwise your platform isn't supported yet. In this case please contact the maintainer (see README)])
+	#fi
+fi
+
+AM_CONDITIONAL(BUILD_WIN32, test "$build_win32" = "true")
+AM_CONDITIONAL(BUILD_LINUX, test "$build_linux" = "true")
+
 
 # -fomit-frame-pointer crashes wine on Ubuntu Dapper--Danny 7/21/06
-#EXTRAFLAGS="-floop-optimize2 -fomit-frame-pointer -fgcse-sm -fgcse-las"
-EXTRAFLAGS="-floop-optimize2 -fgcse-sm  -fgcse-las"
+#DEFAULTFLAGS="-floop-optimize2 -fomit-frame-pointer -fgcse-sm -fgcse-las"
+DEFAULTFLAGS="-O2 -fPIC" #"-floop-optimize2 -fgcse-sm  -fgcse-las"
 
 # Tested with GCC 4.0--needs to be tested with 4.1--Danny 7/21/06
 if test "x`$CC --version|head -1|cut -d\  -f3|cut -d. -f1`" = "x4" ; then
-	EXTRAFLAGS="$EXTRAFLAGS -ftree-vectorize -ftree-loop-linear"
-	if test "x`$CC --version|head -1|cut -d\  -f3|cut -d. -f2`" != "x0" ; then
-		EXTRAFLAGS="$EXTRAFLAGS -funsafe-loop-optimizations -Wunsafe-loop-optimizations"
-	fi	
+	DEFAULTFLAGS="$DEFAULTFLAGS -ftree-vectorize -ftree-loop-linear"
+#	if test "x`$CC --version|head -1|cut -d\  -f3|cut -d. -f2`" != "x0" ; then
+#		DEFAULTFLAGS="$DEFAULTFLAGS -funsafe-loop-optimizations -Wunsafe-loop-optimizations"
+#	fi	
 fi
 
-CFLAGS="$CFLAGS $EXTRAFLAGS"
-CXXFLAGS="$CXXFLAGS $EXTRAFLAGS"
+CFLAGS="$DEFAULTFLAGS $CFLAGS"
+CXXFLAGS="$DEFAULTFLAGS $CXXFLAGS"
 
 AC_PATH_XTRA
 gw_CHECK_QT
@@ -36,7 +72,7 @@ gw_CHECK_QT
 # checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([fcntl.h memory.h string.h sys/ioctl.h unistd.h stdlib.h pthread.h sys/ipc.h sys/shm.h sys/time.h sys/select.h sys/types.h stdarg.h signal.h sched.h])
+AC_CHECK_HEADERS([fcntl.h memory.h string.h sys/ioctl.h unistd.h stdlib.h pthread.h sys/ipc.h sys/shm.h sys/time.h sys/select.h sys/types.h stdarg.h signal.h sched.h ctype.h])
 
 # checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -74,7 +110,7 @@ AH_TEMPLATE(SDL_SDL_AUDIO_H, [Define to location of SDL_audio.h])
 AH_TEMPLATE(SDL_SDL_SOUND_H, [Define to location of SDL_sound.h])
 
 OLD_LIBS="$LIBS"
-LIBS="$LIBS -lpthread"
+#LIBS="$LIBS -lpthread"
 
 # check for SDL-lib
 AC_ARG_WITH(sdl,
@@ -99,7 +135,7 @@ AC_ARG_WITH(sdlsound,
 	AS_HELP_STRING([--without-sdlsound],
 			[disable support for reading samples via SDL_sound]), ,
  	[ with_sdlsound=yes ])
-AH_TEMPLATE(HAVE_SDL_SDL_SOUND_H, [Define to 1 if you have the <$SDL_INCL_PATH/SDL_sound.h> header file.])
+AH_TEMPLATE(HAVE_SDL_SDL_SOUND_H, [Define to 1 if you have the <$SDL_INC_PATH/SDL_sound.h> header file.])
 if test "x$with_sdlsound" = "xyes" -a ! -z "$SDL_INC_PATH"; then
 	AC_CHECK_HEADER($SDL_INC_PATH/SDL_sound.h, HAVE_SDL_SDL_SOUND_H="true")
 	AC_CHECK_LIB([SDL_sound], [Sound_Init], HAVE_LIBSDL_SOUND="true", HAVE_SDL_SDL_SOUND_H="")
@@ -172,48 +208,73 @@ AM_CONDITIONAL(HAVE_LIBJACK, test ! -z "$HAVE_JACK_JACK_H")
 
 # check for proper WINE-installation and existing Steinberg headers
 AC_ARG_WITH(vst,
-	AS_HELP_STRING([--with-vst],
-			[enable support for builtin VST-plugin-hosting]), [ with_vst=yes ], [ with_vst=no ])
-AH_TEMPLATE(HAVE_VST_AEFFECTX_H, [Define to 1 if you have the <aeffectx.h> header file.])
+	AS_HELP_STRING([--without-vst],
+			[disable support for builtin VST-plugin-hosting]), , [ with_vst=yes ])
 if test "x$with_vst" = "xyes" ; then
 
-	ORIG_CFLAGS=$CFLAGS
-	ORIG_CPPFLAGS=$CPPFLAGS
-	CFLAGS="$CLFAGS -I./include"
-	CPPFLAGS="$CPPFLAGS -I./include"
-	ORIG_CC="$CC"
-	CC="$CXX"
-	AC_CHECK_HEADER(aeffectx.h, HAVE_VST_AEFFECTX_H="true")
-	CFLAGS="$ORIG_CFLAGS"
-	CPPFLAGS="$ORIG_CPPFLAGS"
+	if echo $CFLAGS $CXXFLAGS | grep "fomit-frame-pointer" > /dev/null ; then
+		AC_MSG_ERROR([*** passing -fomit-frame-pointer as compiler-flag will break LMMS' VST-support so either disable VST-support using --without-vst or remove it from compiler-flags])
+	fi
 
-	AC_CHECK_PROG(WINEGCC, winegcc, /usr/bin/winegcc,,/usr/bin)
-	AC_CHECK_LIB([wine], [wine_init])
-	if test ! -z "$WINEGCC" ; then
-		if test ! -z "$HAVE_VST_AEFFECTX_H" ; then
-			WINE_OK_BUT_VST_INCOMPLETE=""
-			AC_DEFINE(HAVE_VST_AEFFECTX_H)
-		else
-			WINE_OK_BUT_VST_INCOMPLETE="true"
+	if test "$build_linux" = "true" ; then
+		AC_CHECK_PROG(WINECXX, wineg++, /usr/bin/wineg++,,/usr/bin)
+		AC_CHECK_LIB([wine], [wine_init], true)
+		if test ! -z "$WINECXX" ; then
+			AC_LANG_PUSH(C++)
+#			CXXFLAGS="$CXXFLAGS -I${prefix}/include/wine/windows"
+			OLDCXX="$CXX"
+			OLDCPPFLAGS="$CPPFLAGS"
+			CXX="$WINECXX"
+			CPPFLAGS="$CPPFLAGS -I${prefix}/include/wine/windows"
+			AC_CHECK_HEADER(windows.h, HAVE_WINDOWS_H="true")
+			CXX="$OLDCXX"
+			CPPFLAGS="$OLDCPPFLAGS"
+			AC_LANG_POP(C++)
+			if test -z "$HAVE_WINDOWS_H" ; then
+				WINECXX=""
+			fi
 		fi
 	fi
-	CC="$ORIG_CC"
 fi
-AM_CONDITIONAL(VST_SUPPORT, test ! -z "$WINEGCC")
+AM_CONDITIONAL(VST_SUPPORT, test ! -z "$WINECXX")
 
 
 # check for LADSPA-SDK
-AC_ARG_WITH(src,
-	AS_HELP_STRING([--without-ladspa],
-		[disable support for LADSPA-support]), ,
- 	[ with_ladspa=yes ])
+AC_ARG_WITH(ladspa,
+	AS_HELP_STRING([--without-ladspa], [disable support for LADSPA]), , [ with_ladspa=yes ] )
 AH_TEMPLATE(HAVE_LADSPA_H, [Define to 1 if you have the <ladspa.h> header file.])
+AH_TEMPLATE(LADSPA_SUPPORT, [Define to 1 if you have the <ladspa.h> header file.])
 if test "x$with_ladspa" = "xyes" ; then
 	AC_CHECK_HEADER(ladspa.h, HAVE_LADSPA_H="true")
 fi
 if test ! -z "$HAVE_LADSPA_H" ; then
 	AC_DEFINE(HAVE_LADSPA_H)
 fi
+if [ "$build_linux" = "true" ] ; then
+	AC_DEFINE(LADSPA_SUPPORT)
+fi
+#AM_CONDITIONAL(HAVE_LADSPA_H, test ! -z "$HAVE_LADSPA_H")
+AM_CONDITIONAL(LADSPA_SUPPORT, test "$build_linux" = "true" )
+
+
+# check for STK
+AC_LANG_PUSH(C++)
+AC_ARG_WITH(stk,
+	AS_HELP_STRING([--without-stk], [disable support for STK plugins]), ,
+	[ with_stk=yes ])
+AH_TEMPLATE(HAVE_STK_H, [Define to 1 if you have the <stk/Stk.h> header file.])
+if test "x$with_stk" = "xyes" ; then
+	AC_CHECK_HEADER([stk/Stk.h], HAVE_STK_H="true")
+	AC_CHECK_LIB([stk], [main], HAVE_STK="true", HAVE_STK_H="", 
+							[-ljack -lasound])
+fi
+if test ! -z "$HAVE_STK_H" ; then
+	AC_DEFINE(HAVE_STK_H)
+	AC_SUBST(stk_includes, [/usr/include/stk])
+	AC_SUBST(stk_lib, [/usr/lib])
+fi
+AM_CONDITIONAL(STK_SUPPORT, test ! -z "$HAVE_STK_H")
+AC_LANG_POP(C++)
 
 
 # check for vorbis-lib
@@ -259,23 +320,66 @@ AM_CONDITIONAL(HAVE_LIBFLAC, test ! -z "$HAVE_LIBFLAC")
 
 
 # check for libsamplerate
-AC_ARG_WITH(libsrc,
-	AS_HELP_STRING([--without-libsrc],
-		[disable support for resampling via libsamplerate]), ,
- 	[ with_libsrc=yes ])
-AH_TEMPLATE(HAVE_SAMPLERATE_H, [Define to 1 if you have the <samplerate.h> header file.])
-if test "x$with_libsrc" = "xyes" ; then
-	AC_CHECK_HEADER(samplerate.h, HAVE_SAMPLERATE_H="true")
-	AC_CHECK_LIB([samplerate], [src_simple], HAVE_LIBSRC="true", HAVE_SAMPLERATE_H="")
+AC_CHECK_HEADER(samplerate.h, HAVE_SAMPLERATE_H="true")
+AC_CHECK_LIB([samplerate], [src_simple], HAVE_LIBSRC="true", HAVE_SAMPLERATE_H="")
+AH_TEMPLATE(USE_3RDPARTY_LIBSRC, [Define to 1 if you do not have the <samplerate.h> header file.])
+AM_CONDITIONAL(USE_3RDPARTY_LIBSRC, test -z "$HAVE_SAMPLERATE_H")
+if test -z "$HAVE_SAMPLERATE_H" ; then
+	AC_DEFINE(USE_3RDPARTY_LIBSRC)
+	AC_CHECK_FUNCS(malloc calloc free memcpy memmove)
+
+	AC_CHECK_LIB([m],floor)
+	AC_CHECK_FUNCS(floor ceil fmod)
+
+	AC_C99_FUNC_LRINT
+	AC_C99_FUNC_LRINTF
+	# AC_C99_FUNC_LLRINT  Don't need this (yet?).
+
+	case "x$ac_cv_c99_lrint$ac_cv_c99_lrintf" in
+		xyesyes)
+			;;
+		*)
+			AC_MSG_WARN([[*** Missing C99 standard functions lrint() and lrintf().]])
+			AC_MSG_WARN([[*** This may cause benign compiler warnings on some systems (ie Solaris).]])
+			;;
+		esac
+
+	#====================================================================================
+	# Determine if the processor can do clipping on float to int conversions.
+
+	AC_C_CLIP_MODE
+
+	AC_DEFINE_UNQUOTED(CPU_CLIPS_POSITIVE, ${ac_cv_c_clip_positive},
+		[Target processor clips on positive float to int conversion.])
+	AC_DEFINE_UNQUOTED(CPU_CLIPS_NEGATIVE, ${ac_cv_c_clip_negative},
+		[Target processor clips on negative float to int conversion.])
+
 fi
-if test ! -z "$HAVE_SAMPLERATE_H" ; then
-	AC_DEFINE(HAVE_SAMPLERATE_H)
+
+# check for Festival
+AC_LANG_PUSH(C++)
+AC_ARG_WITH(singerbot,
+	AS_HELP_STRING([--without-singerbot],
+		[disable support for SingerBot plugin]), ,
+	[ with_singerbot=yes ])
+AH_TEMPLATE(SINGERBOT_SUPPORT,
+	[Define to 1 to enable SingerBot plugin support.])
+if test "x$with_singerbot" = "xyes" ; then
+	ORIG_CPPFLAGS=$CPPFLAGS
+	CPPFLAGS="$CPPFLAGS -I/usr/include/festival -I/usr/include/speech_tools -Wno-non-template-friend"
+	AC_CHECK_HEADER([festival.h], FESTIVAL_SUPPORT="true")
+	AC_CHECK_LIB([Festival], [main], true, FESTIVAL_SUPPORT="")
+	CPPFLAGS=$ORIG_CPPFLAGS
 fi
-AM_CONDITIONAL(HAVE_LIBSRC, test ! -z "$HAVE_SAMPLERATE_H")
+if test ! -z "$FESTIVAL_SUPPORT" ; then
+	AC_DEFINE(SINGERBOT_SUPPORT)
+fi
+AC_LANG_POP(C++)
+AM_CONDITIONAL(SINGERBOT_SUPPORT, test ! -z "$FESTIVAL_SUPPORT" )
 
 
 # libsndfile-stuff
-AC_ARG_WITH(sndfile,
+AC_ARG_WITH(libsf,
  	AS_HELP_STRING([--without-libsf],
 		[disable support for importing files via libsndfile]), ,
  	[ with_libsf=yes ])
@@ -322,8 +426,8 @@ AH_TEMPLATE(DISABLE_SURROUND, [Define if you want to disable surround-support in
 AC_ARG_ENABLE([surround],
 	AS_HELP_STRING([--disable-surround],
 			[compile LMMS without surround-support]),
-	DISABLE_SURROUND="yes")
-if test "x$DISABLE_SURROUND" = "xyes" ; then
+	[ENABLE_SURROUND=$enableval])
+if test "x$ENABLE_SURROUND" = "xno" ; then
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(DISABLE_SURROUND)
 else
@@ -336,7 +440,7 @@ AC_MSG_CHECKING([whether to enable high quality sinc-resampling])
 AH_TEMPLATE(HQ_SINC, [Define if you want to enable high quality sinc-resampling.])
 AC_ARG_ENABLE([hqsinc],
 	AS_HELP_STRING([--enable-hqsinc],
-		[enable high quality sinc-resampling]), HQ_SINC="yes")
+		[enable high quality sinc-resampling]), [HQ_SINC=$enableval])
 if test "x$HQ_SINC" = "xyes" ; then
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(HQ_SINC)
@@ -345,17 +449,17 @@ else
 fi
 
 # check whether to disable single-source-compile
-AC_MSG_CHECKING([whether to disable single-source-compile])
+AC_MSG_CHECKING([whether to enable single-source-compile])
 # AH_TEMPLATE(SINGLE_SOURCE_COMPILE, [Define if you want to enable single-source-compile.])
 AC_ARG_ENABLE([ssc],
-	AS_HELP_STRING([--disable-ssc],
-		[disable single-source-compile]), NO_SSC="true")
-if test ! "x$NO_SSC" = "xtrue" ; then
-	AC_MSG_RESULT(no)
+	AS_HELP_STRING([--enable-ssc],
+		[enable single-source-compile]), [ENABLE_SSC=$enableval])
+if test "x$ENABLE_SSC" = "xyes" ; then
+	AC_MSG_RESULT(yes)
 	# AC_DEFINE(SINGLE_SOURCE_COMPILE)
 	CXXFLAGS="$CXXFLAGS -DSINGLE_SOURCE_COMPILE"
 else
-	AC_MSG_RESULT(yes)
+	AC_MSG_RESULT(no)
 fi
 
 
@@ -412,7 +516,8 @@ AC_MSG_CHECKING([whether to enable debugging-code])
 AH_TEMPLATE(LMMS_DEBUG, [Define if you want to disable debbuging-code in LMMS.])
 AC_ARG_ENABLE([debug],
 	AS_HELP_STRING([--enable-debug],
-		[compile LMMS with additional debugging support]), DEBUG="yes")
+		[compile LMMS with additional debugging support]),
+	[DEBUG=$enableval])
 if test "x$DEBUG" = "xyes" ; then
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(LMMS_DEBUG)
@@ -421,6 +526,27 @@ else
 fi
 
 
+AC_MSG_CHECKING([whether to ship caps])
+AC_ARG_WITH([caps],
+	AS_HELP_STRING([--without-caps],
+		[do not ship C* Audio Plugin Suite]), ,
+	[ with_caps=yes ])
+if test "x$with_caps" = "xyes" ; then
+	AC_MSG_RESULT(yes)
+else
+	AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(SHIP_CAPS, test "x$with_caps" = "xyes")
+
+
+if [ "$build_win32" = "true" ] ; then
+	BIN2RES=`pwd`/buildtools/bin2res.exe
+else
+	BIN2RES=`pwd`/buildtools/bin2res
+fi
+AC_SUBST(BIN2RES)
+
+
 # check for rpm SOURCES path
 echo -n "checking for rpm sources path... "
 RPMSOURCEDIR="NOT-FOUND"
@@ -437,10 +563,9 @@ lmmsdatadir="$datadir/$PACKAGE"
 AC_SUBST(lmmsdatadir)
 
 
-#CFLAGS="$CXXFLAGS -g -O2"
-#CXXFLAGS="$CXXFLAGS -g -O2"
+EXTRA_WARNINGS="-Wextra -Wno-unused-parameter -Winline -Wdisabled-optimization"
 if test "x$CXX" == "xg++" ; then
-	CXXFLAGS="$CXXFLAGS -ansi -Wall -fno-exceptions"
+	CXXFLAGS="$CXXFLAGS -ansi -Wall $EXTRA_WARNINGS -fno-exceptions"
 fi
 
 LDFLAGS="$LDFLAGS -L/usr/local/lib"
@@ -481,14 +606,26 @@ AC_CONFIG_FILES([Makefile
 		 data/track_icons/Makefile
 		 plugins/Makefile
 		 plugins/audio_file_processor/Makefile
+		 plugins/bass_booster/Makefile
 		 plugins/bit_invader/Makefile
 		 plugins/flp_import/Makefile
+		 plugins/kicker/Makefile
+		 plugins/ladspa_base/Makefile
+		 plugins/ladspa_effect/Makefile
+		 plugins/ladspa_effect/caps/Makefile
+		 plugins/lb302/Makefile
+		 plugins/live_tool/Makefile
 		 plugins/midi_import/Makefile
 		 plugins/organic/Makefile
-		 plugins/plucked_string_synth/Makefile
+		 plugins/patman/Makefile
+		 plugins/singerbot/Makefile
+		 plugins/stk/Makefile
+		 plugins/stk/mallets/Makefile
 		 plugins/triple_oscillator/Makefile
 		 plugins/vestige/Makefile
 		 plugins/vibed/Makefile
+		 plugins/vst_base/Makefile
+		 plugins/vst_effect/Makefile
 		 lmms.spec])
 AC_OUTPUT
 
@@ -626,94 +763,105 @@ else
 fi
 
 
-
-# not yet...
-#if test -z "$HAVE_LADSPA_H" ; then
-#	echo " ========================"
-#	echo " ===  LMMS - WARNING  ======================================================="
-#	echo " ========================"
-#	echo " ="
-#	echo " = You don't seem to have installed LADSPA-SDK which is neccessary for"
-#	echo " = building LMMS with LADSPA support. LADSPA-support is very useful"
-#	echo " = as you're able to use a lot of LADSPA-effects inside LMMS."
-#	echo " = Consider installing the missing packages for using the full power of LMMS."
-#	echo " ="
-#	with_warnings="true"
-#else
-#	PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* LADSPA-plugins"
-#fi
-
-
-
-
 if test -z "$HAVE_SAMPLERATE_H" ; then
 	echo " ========================"
 	echo " ===  LMMS - WARNING  ======================================================="
 	echo " ========================"
 	echo " ="
 	echo " = You don't seem to have libsamplerate installed and/or libsamplerate-"
-	echo " = development-package is missing. This will disable resampling with"
-	echo " = libsamplerate and results in worse quality! Currently LMMS will also"
-	echo " = crash more often, because internal sample-rate-converter has some bugs..."
-	echo " = Consider installing the missing packages for using the full power of LMMS."
+	echo " = development-package is missing. If you ignore this warning the"
+	echo " = according source-code of libsamplerate will be directly compiled into"
+	echo " = LMMS which is no problem at all. If you're building official LMMS-packages"
+	echo " = for a distribution DO NOT IGNORE THIS WARNING."
 	echo " ="
-	with_warnings="true"
-else
-	PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* libsamplerate for internal samplerate-conversion"
 fi
 
 
-if test "x$with_vst" = "xno" ; then
-	echo " ========================"
-	echo " ===  LMMS - INFORMATION  ==================================================="
-	echo " ========================"
-	echo " ="
-	echo " = If you want VST-support within LMMS, please pass"
-	echo " ="
-	echo " = --with-vst"
-	echo " ="
-	echo " = to configure, since it is disabled per default!"
-	echo " ="
-else
 
-	if test ! -z "$WINE_OK_BUT_VST_INCOMPLETE" ; then
+
+if test "$build_linux" = "true" ; then
+	PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* LADSPA-plugins"
+	if test -z "$HAVE_LADSPA_H" ; then
 		echo " ========================"
 		echo " ===  LMMS - WARNING  ======================================================="
 		echo " ========================"
 		echo " ="
-		echo " = You seem to have a proper WINE-installation, but the header-files"
-		echo " = (AEffect.h and aeffectx.h) from Steinberg-VST-SDK are missing or not present"
-		echo " = in /usr/include/ or ./include. We cannot distribute them as they're licensed under"
-		echo " = a GPL-incompatible license, so you'll have to download them at"
-		echo " ="
-		echo " = http://audacity.cvs.sourceforge.net/*checkout*/audacity/audacity-old/effects/aeffectx.h"
-		echo " = http://audacity.cvs.sourceforge.net/*checkout*/audacity/audacity-old/effects/AEffect.h"
-		echo " ="
-		echo " = and put the mentioned files into /usr/include/ or ./include."
-		echo " = Otherwise (now!) configure will disable LMMS's support for built-in VST-"
-		echo " = plugin-usage. If you do not intend to use VST-plugins with LMMS you can "
-		echo " = ignore this warning."
-		echo " = Consider installing the missing packages for using the full power of LMMS."
+		echo " = As the header file ladspa.h could not be found on your system, a version"
+		echo " = shipped with LMMS will be used. This is no problem at all but generally"
+		echo " = it's better to use files being customized to your system/distribution."
+		echo " = If you encounter problems related to LADSPA-support, try to install"
+		echo " = LADSPA-SDK-package (ladspa-sdk, ladspa-dev or similiar) and run configure"
+		echo " = again."
 		echo " ="
 		with_warnings="true"
-	else
-		if test ! -z "$HAVE_VST_AEFFECTX_H" ; then
-			PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* LMMS VST Support Layer (LVSL) for integrated VST-plugin usage"
-		else
-			echo " ========================"
-			echo " ===  LMMS - WARNING  ======================================================="
-			echo " ========================"
-			echo " ="
-			echo " = You don't seem to have installed WINE or it's development-packages (headers,"
-			echo " = winegcc etc.) which are neccessary for building LMMS with built-in"
-			echo " = VST-support."
-			echo " = If you do not intend to use VST-plugins with LMMS you can ignore this "
-			echo " = warning."
-			echo " = Consider installing the missing packages for using the full power of LMMS."
-			echo " ="
-			with_warnings="true"
-		fi
 	fi
+else
+	echo " ========================"
+	echo " ===  LMMS - WARNING  ======================================================="
+	echo " ========================"
+	echo " ="
+	echo " = You're building LMMS for a platform other than Linux which will prevent"
+	echo " = configure from enabling LADSPA-support."
+	echo " ="
+	with_warnings="true"
+fi
+
+
+
+if test -z "$HAVE_STK_H" ; then
+	echo " ========================"
+	echo " ===  LMMS - WARNING  ======================================================="
+	echo " ========================"
+	echo " ="
+	echo " = You don't seem to have STK installed and/or STK-development-package"
+	echo " = (Debian/Ubuntu: libstk0-dev) is missing. Without this package, the "
+	echo " = STK instrument plugins (\"Mallets\") won't be built."
+	echo " = Consider installing the missing packages for using the full power of LMMS."
+	echo " ="
+	with_warnings="true"
+else
+	PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* STK instrument plugins"
+fi
+
+
+
+if test -z "$FESTIVAL_SUPPORT" ; then
+	if test "x$with_singerbot" = "xyes" ; then
+		echo " ========================"
+		echo " ===  LMMS - WARNING  ======================================================="
+		echo " ========================"
+		echo " ="
+		echo " = You don't seem to have Festival development files."
+		echo " = The SingerBot instrument plugin will be ignored."
+		echo " = Before enabling this plugin, bear in mind that it is still experimental."
+		echo " ="
+		echo " = To remove this warning, please pass"
+		echo " = "
+		echo " = --without-singerbot"
+		echo " ="
+		with_warnings="true"
+	fi
+else
+	PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* SingerBot instrument plugin"
+fi
+
+
+if test ! -z "$WINECXX" ; then
+	PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* LMMS VST Support Layer (LVSL) for built-in VST-plugin usage"
+else
+	echo " ========================"
+	echo " ===  LMMS - WARNING  ======================================================="
+	echo " ========================"
+	echo " ="
+	echo " = You don't seem to have installed WINE or it's development-packages (headers,"
+	echo " = winegcc etc.) which are neccessary for building LMMS with built-in"
+	echo " = VST-support."
+	echo " = If you do not intend to use VST-plugins with LMMS you can ignore this "
+	echo " = warning."
+	echo " = Consider installing the missing packages (Debian: libwine-dev,"
+	echo " = Ubuntu: wine-dev, openSUSE: wine-devel) for using the full power of LMMS."
+	echo " ="
+	with_warnings="true"
 fi
 
 
@@ -729,7 +877,7 @@ echo " ="
 if test "$with_warnings" = "false" ; then
 	echo " = LMMS has been configured successfully. Now you can build it by typing 'make'."
 	echo " = After the compilation-process has finished, you can install LMMS by"
-	echo " = typing 'make install'."
+	echo " = typing 'make install' (do this as \"root\"!)."
 else
 	echo " = LMMS has been configured, but there were one or more warnings you should"
 	echo " = not ignore. First try to solve the mentioned problems before"
@@ -738,7 +886,7 @@ else
 fi
 echo " ="
 echo " = If there're problems while compiling LMMS, please send a mail to "
-echo " = tobydox [at] users.sourceforge.net!"
+echo " = lmms-devel \[at\] lists.sf.net!"
 echo " ="
 echo
 

data/Makefile.am

@@ -1,2 +1,13 @@
 SUBDIRS = locale midi-maps presets projects samples themes track_icons
 
+menudir = $(datadir)/menu
+menu_DATA = lmms
+
+applicationsdir = $(datadir)/applications
+applications_DATA = lmms.desktop
+
+mimedir = $(datadir)/mime/packages
+mime_DATA = lmms.xml
+
+EXTRA_DIST = $(menu_DATA) $(applications_DATA) $(mime_DATA)
+

data/lmms

@@ -0,0 +1,4 @@
+?package(lmms):needs="X11" section="Apps/Sound" \
+  title="LMMS" hints="Audio" command="/usr/bin/lmms" \
+  longtitle="Linux MultiMedia Studio" \
+  icon="/usr/share/lmms/themes/default/icon.png"

data/lmms.desktop

@@ -0,0 +1,15 @@
+[Desktop Entry]
+Name=Linux MultiMedia Studio
+GenericName=software for music-production
+GenericName[ca]=Programari de producció musical
+GenericName[de]=Software zur Musik-Produktion
+Comment=easy music-production for everyone!
+Comment[ca]=Producció fàcil de música per a tothom!
+Icon=/usr/share/lmms/themes/default/icon.png
+Exec=/usr/bin/lmms
+Terminal=false
+Type=Application
+Encoding=UTF-8
+X-Desktop-File-Install-Version=0.3
+Categories=Application;AudioVideo;Qt
+MimeType=application/x-lmms-project

data/lmms.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-lmms-project">
+    <sub-class-of type="application/xml"/>
+    <comment>LMMS project</comment>
+    <comment xml:lang="ca">Projecte LMMS</comment>
+    <glob pattern="*.mmp"/>
+    <glob pattern="*.mmpz"/>
+    <magic priority="80">
+      <match type="string" value="&lt;!DOCTYPE multimedia-project" offset="0:256"/>
+      <match type="string" value="&lt;multimedia-project" offset="0:64"/>
+    </magic>
+  </mime-type>
+</mime-info>

data/locale/Makefile.am

@@ -1,7 +1,7 @@
 localedir = $(lmmsdatadir)/locale
 
-locale_DATA = $(wildcard *.qm)
-locale_SOURCES = $(wildcard *.ts)
+locale_DATA = *.qm
+locale_TSOURCES = *.ts
 
-EXTRA_DIST = $(locale_DATA) $(locale_SOURCES)
+EXTRA_DIST = $(locale_DATA) $(locale_TSOURCES)
 

data/presets/AudioFileProcessor/Makefile.am

@@ -1,6 +1,6 @@
 afppresetsdir = $(lmmsdatadir)/presets/AudioFileProcessor
 
-afppresets_DATA = $(wildcard *.cs.xml)
+afppresets_DATA = *.cs.xml
 
 EXTRA_DIST = $(afppresets_DATA)
 

data/presets/BitInvader/Makefile.am

@@ -1,5 +1,5 @@
 bipresetsdir = $(lmmsdatadir)/presets/BitInvader
-bipresets_DATA = $(wildcard *.cs.xml)
+bipresets_DATA = *.cs.xml
 
 EXTRA_DIST = $(bipresets_DATA)
 

data/presets/Organic/Makefile.am

@@ -1,6 +1,6 @@
 psspresetsdir = $(lmmsdatadir)/presets/Organic
 
-psspresets_DATA = $(wildcard *.cs.xml)
+psspresets_DATA = *.cs.xml
 
 EXTRA_DIST = $(psspresets_DATA)
 

data/presets/PluckedStringSynth/Makefile.am

@@ -1,6 +1,6 @@
 psspresetsdir = $(lmmsdatadir)/presets/PluckedStringSynth
 
-psspresets_DATA = $(wildcard *.cs.xml)
+psspresets_DATA = *.cs.xml
 
 EXTRA_DIST = $(psspresets_DATA)