Commit Graph

2573 Commits

Author SHA1 Message Date
Tobias Doerffel
730798317d FLTK/CMakeLists.txt: fix CMAKE_MODULE_PATH, don't use 3rdparty code
Fix setting CMAKE_MODULE_PATH to respect the previous content of this
variable. Furthermore do not process subdirectories with 3rdparty code
even if no libjpeg, libpng or libz was found on the target system.
2010-07-26 15:12:17 +02:00
Tobias Doerffel
f730ed7acb Merge branch 'master' into zynaddsubfx-master
Conflicts:
	plugins/zynaddsubfx/CMakeLists.txt
2010-07-26 15:12:06 +02:00
Tobias Doerffel
c105c2e606 ZynAddSubFX/FLTK: updated to SVN revision 7680
Updated FLTK to SVN revision 7680 of branch-1.3:

    - Fixed X11/XDBE double buffering (STR #2152, #2197)
    - Added new label and image alignments (STR #2269)
    - Added documentation for event delivery (STR #1983)
    - Fixed menu and tooltip window animation bug under X11 (compiz)
      by setting an appropriate window type (STR #2082)
    - redesigned CMake files (STR #2317).
    - Fixed max. fd calculation, if USE_POLL is enabled (STR #2324)
    - Fixed clipping for offscreen rendering (OSX, STR #2330)
    - Added printing support (Fl_Printer class and friends) for native
      printing on Windows and Mac OS X, PostScript printing on X11
      with CUPS or lp, and PostScript file output on all platforms
    - Added basic Fl_Device abstraction layer for all drawing functions
    - Fixed possibility of wrong flags() in Fl_Window::iconlabel()
      (STR #2161)
    - Fixed Scrollbar events when max is less than min (STR #2283)
    - Added argument-less constructor in Fuid Widget Class
    - Fixed menu item counting issue in Fluid (STR #2322)
    - Added Fl_Menu_::find_item by callback
    - Removed redundant Fl_Group casts
    - Added indexing to Fl_Preferences
    - Integrated default menu into Demo test app
    - Added automated Xcode IDE file generation to Fluid
    - Fixed lost top item in Fluid's tree browser (STR #2233)
    - Fixed crash in test/Editor when freeing buffer
      too soon (STR #2294)
    - Fixed Fl_Preferences Cygwin wide character bug (STR #2164)
    - Fixed sorting in Fl_Browser - last item would not
      be sorted (STR #2300)
    - Fixed window levels in OS X Cocoa (STR #2316)
    - Added jpeg support to Fluid image() element
    - Added loading jpeg images from memory
    - Added binary data type to Fluid
    - File chosser preview would hang if a device was choosen
    - Replaced _WIN32 symbols that had come with UTF-8 and the
      new Fl_Table widget with WIN32
    - Fixed a buffer overflow in fl_utf8from_mb() (STR #2279)
    - Fixed a Windows GDI leak when testing alpha blending capabilities
    - Fixed a name conflict with new (VS 2008 Express) winsock2.h
      versions and another conflict that produced compile errors
      with VS 2008 Express (STR #2301)
    - Widgets now remove stale entries from the default callback
      queue when they are deleted (STR #2302)
        - Moved OS X code base to the more moder Cocoa toolkit thanks
          to the awesome work of Manolo Gouy (STR #2221)
        - Added template to generate new projects with Xcode.
    - New widgets: Fl_Tree, Fl_Table, Fl_Native_File_Chooser
    - added Fl_Menu_ methods: insert(), find_index(), clear_submenu()
    - Bug reports/enhancements now refer to the STR form http://www.fltk.org/str.php
2010-07-26 15:11:11 +02:00
Tobias Doerffel
4ea8b9d9c2 Merge branch 'mingw64-compat-fixes'
* mingw64-compat-fixes:
  CMakeLists.txt: install libFLAC-8.dll for win32 build
  Improved support for MinGW cross compile builds
2010-07-26 15:04:00 +02:00
Tobias Doerffel
7b0b9997b9 CMakeLists.txt: install libFLAC-8.dll for win32 build
After updating some external libraries, libFLAC-8.dll is now required
as well, so install it into the win32 package.
(cherry picked from commit e8c8054535)
2010-07-26 15:03:53 +02:00
Tobias Doerffel
eaebe3cb84 ZynAddSubFX: check whether QDomDocument::setContent() succeeded
When saving settings in ZynAddSubFxInstrument::saveSettings() check
whether the call to QDomDocument::setContent() succeeded. Otherwise
LMMS crashes when calling QDomDocument::importNode() later due to a bug
in QtXml.

Fixes crash in the unlikely situation that transmission of XML data from
the ZynAddSubFX plugin to LMMS somehow failed.
2010-07-25 20:47:04 +02:00
Tobias Doerffel
c6640ffd37 ZynAddSubFX: completely reinitialize config after changing working dir
Custom changes made to the config after first initialization got lost
after setting work directory. Therefore moved custom initialization into
a separate function which is called after setting work directory.
2010-07-25 20:42:26 +02:00
Tobias Doerffel
79abf9ca85 ZynAddSubFX: set working directory before setting preset directory
Set working directory before setting preset directory as otherwise
the changes made by LocalZynAddSubFx::setPresetDir() will get lost.
2010-07-25 20:14:20 +02:00
Tobias Doerffel
9984e47b60 Merge branch 'master' into zynaddsubfx-master 2010-07-25 20:13:59 +02:00
Tobias Doerffel
89451dcd3b ZynAddSubFX/CMakeLists.txt: use global binary dir as last include dir
The local binary directory should be more prioritized regarding
file inclusions. Otherwise for example the global embedded_resources.h
gets included instead of the plugin-specific one.
2010-07-25 20:09:41 +02:00
Tobias Doerffel
ac1a286dff ZynAddSubFX/CMakeLists.txt: remove accidently added subdirectory
The src/Tests/ directory was not copied from upstream, therefore do not
reference it in CMakeLists.txt.
2010-07-25 19:37:05 +02:00
Tobias Doerffel
a55d71cf7f RemotePlugin: use debugMessages() instead of fprintf for error messages
Printing error messages using fprintf() does not help much with
RemotePlugins as their stdout/stderr usually is not redirected to the
parent process. Instead use the debugMessage() function.
2010-07-25 19:27:27 +02:00
Tobias Doerffel
000f67d01d ZynAddSubFX: save configuration file in LMMS working directory
On non-Linux platforms configuration file was saved in the application
path which definitely is not desired and also will not work in many
situations. Therefore always save ZynAddSubFX configuration file in
LMMS working directory.
2010-07-25 19:16:52 +02:00
Tobias Doerffel
c7372240c9 ZynAddSubFX: resynced with upstream (version 2.4.1)
There have been some major updates with ZynAddSubFX. Completely resynced
whole source tree up to version 2.4.1.
2010-07-25 18:31:49 +02:00
Tobias Doerffel
63f7846cf2 Merge branch 'master' into zynaddsubfx-master 2010-07-25 17:28:26 +02:00
Tobias Doerffel
30060e41b7 ZynAddSubFX: added window icon (win32 version only)
Added a window icon to ZynAddSubFX windows for better appearance.
This is currently only possible for the win32 version a lot more hacks
are required to achieve this for X as well :-(
2010-07-25 17:02:27 +02:00
Tobias Doerffel
a7aff505c1 CMakeLists.txt: rename config.to to src_config.h
Commit e07ed33827 renamed config.h to
src_config.h. Also reflect that change in CMakeLists.txt.
2010-07-25 16:51:38 +02:00
Tobias Doerffel
fe7486750b ZynAddSubFX: allow hiding UI by closing main window
It's now possible to hide the ZynAddSubFX UI by simply closing its main
window instead of going back to LMMS and toggle the "Show UI" button.

Furthermore moved code for GUI thread into a non-static member function
of RemoteZynAddSubFx and removed the old code for handling IdHideUI
messages.
2010-07-25 15:20:48 +02:00
Tobias Doerffel
5c2c356ba4 lmms.rc.in: updated copyright year
Updated copyright year in win32 resource file.
2010-07-25 14:38:59 +02:00
Tobias Doerffel
e07ed33827 3rdparty/libsamplerate: renamed config.h to src_config.h
We must not have any file called config.h in directories which are added
to global include directories. For example when building the CALF plugin
the file config.h from libsamplerate was used rather than CALF's local
one. Fixes missing LADSPA symbols in CALF library if no usable
libsamplerate was found in the system at configure time.

Also bumped version number in src_config.h.
2010-07-25 14:36:01 +02:00
Tobias Doerffel
5f33f1ea77 RemoteVstPlugin: silence compiler warning
Initialize variable of type DWORD with 0 instead of NULL.
2010-07-25 11:34:53 +02:00
Tobias Doerffel
5306f7b0ca TrackContentObject: keep position in paste()
When calling TrackContentObject::paste(), only the content should be
pasted, not the position. This fixes pasting for example note patterns
and is also a more generic solution for the bug fixed in commit
4ec5c6afe1.

Closes #3005649.
2010-07-25 01:26:43 +02:00
Tobias Doerffel
3b642271a8 When cloning BB track, indicate this fact in name of cloned BB track
Cloning a BB track can be rather confusing (e.g. two "Beat/Bassline 0").
Therefore prepend an indication to the name of the cloned BB track.
2010-07-25 01:13:39 +02:00
Tobias Doerffel
c16e04c0dd Fixed cloning of BB tracks
Not sure when it broke but cloning BB tracks erroneously cloned
positions of TCOs as well which made the source BB track have
two TCOs one upon the other while the destination BB did not have
any TCOs at all.

The fix is to save the position of the destination TCO before and
restore it manually after paste().
2010-07-25 01:13:32 +02:00
Tobias Doerffel
7b0b932441 ZynAddSubFX: on Linux link against libfontconfig
FLTK requires libfontconfig on Linux, therefore link against it.
2010-07-25 01:13:28 +02:00
Tobias Doerffel
b30e91042b NotePlayHandle: fix broken note detuning feature
Commit 884b9ca671 completely broke the
note detuning feature as the detuning value was not incoorporated into
the frequency calculation anymore. Fix this by adding the detuning value
to the pitch variable.
2010-07-25 00:23:38 +02:00
Tobias Doerffel
8ef98b63db Merge branch 'calf-updates'
* calf-updates:
  Fix incorrect plugin class (spotted by Luis Garrido).
  Add windowing-based antialiasing to hard sync in Monosynth; update last stretch even if synth is idle. (cherry picked from commit d64a0487d88f6730ef90dd6d79b892ad4a114138)
2010-07-24 23:42:51 +02:00
Krzysztof Foltman
2eba055de0 Fix incorrect plugin class (spotted by Luis Garrido).
It's SimulatorPlugin, not SimulationPlugin.
(cherry picked from commit d971297ebebd9faf6c2640fdbecdfc553cd8407e)
2010-07-24 23:42:36 +02:00
Krzysztof Foltman
e551929196 Add windowing-based antialiasing to hard sync in Monosynth; update last stretch even if synth is idle.
(cherry picked from commit d64a0487d88f6730ef90dd6d79b892ad4a114138)
2010-07-24 23:41:54 +02:00
Tobias Doerffel
918c7b6f4c LMMS: do not link against libzip
As of ce8041b9e3 it's up to the FLP
import plugin to link against it required libraries. LMMS itself
currently does not need libzip.
2010-07-24 23:38:59 +02:00
Tobias Doerffel
f0a4340d72 Do not use -ftree-vectorize per default anymore
The compiler flag -ftree-vectorize brings only little advantages in
some special cases. In all other cases either worse or even wrong code is
generated due to bugs in GCC (especially for Win32). Therefore remove it.
(cherry picked from commit 47f56ed460)
2010-07-24 23:38:39 +02:00
Tobias Doerffel
87f1313e57 AboutDialog: show correct copyright years
It's been two years that the copyright years were not updated in the
AboutDialog. Fix this.
(cherry picked from commit 57540de703)
2010-07-24 22:54:35 +02:00
Tobias Doerffel
7fd04e0769 Plugins: export PluginDescriptors and lmms_plugin_main function
Various plugins were missing the PLUGIN_EXPORT declaration with their
PluginDescriptor instantiations and lmms_plugin_main implementation
which made some plugins not show up with latest Win32 build.
(cherry picked from commit f85898ba6e)
2010-07-24 22:54:00 +02:00
Tobias Doerffel
ce8041b9e3 FLP import plugin: explicitely link against libzip
The improved FLP import plugin requires libzip and we can't rely on
the LMMS binary being linked against it, therefore link against it
explicitely.
2010-07-21 20:08:53 +02:00
Tobias Doerffel
456abc4cde ZynAddSubFx: MinGW64-specific fixes
Some minor modifications were neccessary in order to build LMMS with
the latest MinGW64 environment.
2010-06-16 23:12:53 +02:00
Tobias Doerffel
46e9bdcf76 Merge branch 'calf-updates'
* calf-updates:
  CALF: minor LMMS-specific updates
2010-06-16 23:05:17 +02:00
Tobias Doerffel
4393ec8281 CALF: minor LMMS-specific updates
Silence a compiler warning introduced by custom changes and fix a
possible compile failure by including another header file in a header
file that we cleared before.
2010-06-16 23:01:58 +02:00
Janne Sinisalo
401652a100 Newer ZynAddSubFX plugin tab background
Replaced the background for ZynAddSubFX plugin tab in the instrument window again.
2010-06-03 19:58:51 +03:00
Janne Sinisalo
45fc5c6ac7 New ZynAddSubFX plugin tab background
Replaced the background for ZynAddSubFX plugin tab in the instrument window.
2010-06-03 18:30:53 +03:00
Tobias Doerffel
1fd115afea Merge branch 'calf-updates'
* calf-updates:
  Cleanups/bugfixes in Monosynth.
2010-05-26 12:38:22 +02:00
Krzysztof Foltman
6ebc7c80d1 Cleanups/bugfixes in Monosynth.
(cherry picked from commit 404e1a0861e9b7a79f3b0175f40b427c06945adc)
2010-05-26 12:36:59 +02:00
Tobias Doerffel
d7ce7d485b Themes: explicitely set background and text color for tooltips
As the colors of QToolTip depend on the desktop environment used,
explicitely set background and text color for fixing cases like
white text on bright yellow background.

Closes #3006955.
2010-05-26 12:27:23 +02:00
Andrew Kelley
f9015ac945 Save/Discard instead of Yes/No
Integrates Sami Boukortt's patch described below:

I have made a patch for the “Save changes?” dialog box to let the user choose
between “Save”, “Discard” and “Cancel” instead of “Yes”, “No” and “Cancel”.

I find this way more intuitive, since it enables Qt to reorganize the buttons
properly according to the platform and to give them an icon (at least on X11).

It also allows users to know what is going to happen without having to read
the question.
2010-05-24 17:53:12 -07:00
Andrew Kelley
0876e7cb9b Add .gitignore file 2010-05-24 17:52:20 -07:00
Tobias Doerffel
9c856454d1 Merge branch 'calf-updates'
* calf-updates:
  CALF: Added missing config.h
2010-05-22 01:32:05 +02:00
Tobias Doerffel
33807aeb43 CALF: Added missing config.h
Now that we're not removing the config.h-inclusions from upstream's
source files we have to provide a dummy config.h. At the same time this
allows us to move macro definitions from CMakeLists.txt to config.h.
2010-05-22 01:28:57 +02:00
Tobias Doerffel
d2a4a9dbd0 Merge branch 'calf-updates'
* calf-updates:
  CALF: rebased to CALF master branch
  Moved CALF headers to  proper location
2010-05-21 17:08:39 +02:00
Tobias Doerffel
469ca939cf CALF: rebased to CALF master branch
There have been massive changes in CALF's master branch. It makes no
sense to manually cherry-pick all these commits. Therefore rebased the
CALF codebase in LMMS to the one found in CALF master branch.
2010-05-21 17:07:03 +02:00
Tobias Doerffel
96a961bd8b Merge branch 'master' into calf-updates 2010-05-21 16:52:59 +02:00
Tobias Doerffel
bbb91a923c Moved CALF headers to proper location
The directory layout for some reason was not the same as with
upstream CALF, therefore move the includes to where they belong.
2010-05-21 16:17:56 +02:00