mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-04 21:04:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

use lmmsconfig.h rather than config.h and use prefixed macro-names

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1097 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-06-08 11:30:47 +00:00
parent 6dcedad4f0
commit d6262bb556
81 changed files with 376 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
ChangeLog
View File

@@ -1,3 +1,92 @@
2008-06-08 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* plugins/ladspa_effect/tap/tap_deesser.c:
* plugins/ladspa_effect/tap/tap_sigmoid.c:
* plugins/ladspa_effect/tap/tap_doubler.c:
* plugins/ladspa_effect/tap/ladspa-local.h:
* plugins/ladspa_effect/tap/tap_eqbw.c:
* plugins/ladspa_effect/tap/tap_pinknoise.c:
* plugins/ladspa_effect/tap/tap_chorusflanger.c:
* plugins/ladspa_effect/tap/tap_eq.c:
* plugins/ladspa_effect/tap/tap_limiter.c:
* plugins/ladspa_effect/tap/ladspa.h:
* plugins/ladspa_effect/tap/tap_vibrato.c:
* plugins/ladspa_effect/tap/tap_autopan.c:
* plugins/ladspa_effect/tap/tap_pitch.c:
* plugins/ladspa_effect/tap/tap_dynamics_st.c:
* plugins/ladspa_effect/tap/tap_echo.c:
* plugins/ladspa_effect/tap/tap_tremolo.c:
* plugins/ladspa_effect/tap/tap_tubewarmth.c:
* plugins/ladspa_effect/tap/tap_dynamics_m.c:
* plugins/ladspa_effect/tap/Makefile.am:
* plugins/ladspa_effect/tap/tap_reflector.c:
* plugins/ladspa_effect/tap/tap_reverb.c:
* plugins/ladspa_effect/tap/tap_rotspeak.c:
* plugins/ladspa_effect/caps/basics.h:
* plugins/ladspa_effect/caps/Makefile.am:
* plugins/vst_base/lvsl_client.cpp:
* plugins/vst_base/lvsl_server.cpp:
* plugins/vst_base/communication.h:
* plugins/midi_import/midi_import.h:
* include/effect.h:
* include/midi_dummy.h:
* include/endian_handling.h:
* include/track.h:
* include/note.h:
* include/engine.h:
* include/sweep_oscillator.h:
* include/debug.h:
* include/midi_alsa_raw.h:
* include/config_mgr.h:
* include/import_filter.h:
* include/audio_file_wave.h:
* include/mixer.h:
* include/audio_file_ogg.h:
* include/ladspa_manager.h:
* include/ladspa_control.h:
* include/sample_buffer.h:
* include/fx_mixer.h:
* include/nstate_button.h:
* include/audio_pulseaudio.h:
* include/clipboard.h:
* include/audio_sdl.h:
* include/micro_timer.h:
* include/midi_event_processor.h:
* include/audio_jack.h:
* include/piano_roll.h:
* include/volume.h:
* include/oscillator.h:
* include/export.h:
* include/midi_alsa_seq.h:
* include/tool.h:
* include/setup_dialog.h:
* include/tab_bar.h:
* include/audio_device.h:
* include/audio_oss.h:
* include/audio_alsa.h:
* src/gui/piano_roll.cpp:
* src/gui/main_window.cpp:
* src/gui/song_editor.cpp:
* src/gui/setup_dialog.cpp:
* src/gui/about_dialog.cpp:
* src/tracks/instrument_track.cpp:
* src/core/plugin.cpp:
* src/core/song.cpp:
* src/core/config_mgr.cpp:
* src/core/audio/audio_oss.cpp:
* src/core/envelope_and_lfo_parameters.cpp:
* src/core/main.cpp:
* src/core/mmp.cpp:
* src/core/ladspa_manager.cpp:
* src/core/ladspa_control.cpp:
* src/core/sample_buffer.cpp:
* Makefile.am:
use lmmsconfig.h rather than config.h and use prefixed macro-names
* acinclude.m4:
* configure.in:
create include/lmmsconfig.h which contains prefixed config.h defines
2008-06-07 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* src/core/song.cpp:

3
Makefile.am
View File

@@ -496,6 +496,9 @@ lmms_SOURCES = \
$(srcdir)/include/lfo_controller.h \
$(THIRD_PARTY_CODE)
lmms_includedir = $(pkgincludedir)
lmms_include_HEADERS = $(wildcard include/*.h include/lmmsconfig.h)
# $(srcdir)/src/tracks/sample_track.cpp
EXTRA_DIST = $(lmms_EMBEDDED_RESOURCES) lmms.1

6
include/audio_alsa.h
View File

@@ -26,11 +26,9 @@
#ifndef _AUDIO_ALSA_H
#define _AUDIO_ALSA_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifdef HAVE_ALSA_ASOUNDLIB_H
#ifdef LMMS_HAVE_ALSA_ASOUNDLIB_H
#ifndef ALSA_SUPPORT
#define ALSA_SUPPORT

5
include/audio_device.h
View File

@@ -30,15 +30,10 @@
#include <QtCore/QMutex>
#include <QtCore/QThread>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "mixer.h"
#include "tab_widget.h"
class audioPort;

10
include/audio_file_ogg.h
View File

@@ -2,7 +2,7 @@
* audio_file_ogg.h - Audio-device which encodes wave-stream and writes it
* into an OGG-file. This is used for song-export.
*
* Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -27,11 +27,9 @@
#ifndef _AUDIO_FILE_OGG_H
#define _AUDIO_FILE_OGG_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifdef HAVE_VORBIS_CODEC_H
#ifdef LMMS_HAVE_VORBIS_CODEC_H
#include <vorbis/codec.h>
@@ -71,7 +69,7 @@ public:
private:
virtual void FASTCALL writeBuffer( const surroundSampleFrame * _ab,
virtual void writeBuffer( const surroundSampleFrame * _ab,
const fpp_t _frames,
const float _master_gain );

2
include/audio_file_wave.h
View File

@@ -65,7 +65,7 @@ public:
private:
virtual void FASTCALL writeBuffer( const surroundSampleFrame * _ab,
virtual void writeBuffer( const surroundSampleFrame * _ab,
const fpp_t _frames,
float _master_gain );

6
include/audio_jack.h
View File

@@ -26,11 +26,9 @@
#ifndef _AUDIO_JACK_H
#define _AUDIO_JACK_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifdef HAVE_JACK_JACK_H
#ifdef LMMS_HAVE_JACK_JACK_H
#define JACK_SUPPORT

6
include/audio_oss.h
View File

@@ -26,11 +26,9 @@
#ifndef _AUDIO_OSS_H
#define _AUDIO_OSS_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#if defined HAVE_SYS_SOUNDCARD_H || defined HAVE_SOUNDCARD_H
#if defined LMMS_HAVE_SYS_SOUNDCARD_H || defined LMMS_HAVE_SOUNDCARD_H
#define OSS_SUPPORT

6
include/audio_pulseaudio.h
View File

@@ -26,11 +26,9 @@
#ifndef _AUDIO_PULSEAUDIO_H
#define _AUDIO_PULSEAUDIO_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifdef HAVE_PULSE_PULSEAUDIO_H
#ifdef LMMS_HAVE_PULSE_PULSEAUDIO_H
#ifndef PULSEAUDIO_SUPPORT
#define PULSEAUDIO_SUPPORT

10
include/audio_sdl.h
View File

@@ -26,19 +26,17 @@
#ifndef _AUDIO_SDL_H
#define _AUDIO_SDL_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifdef HAVE_SDL_SDL_AUDIO_H
#ifdef LMMS_HAVE_SDL_SDL_AUDIO_H
#ifndef SDL_AUDIO_SUPPORT
#define SDL_AUDIO_SUPPORT
#endif
#include SDL_SDL_H
#include SDL_SDL_AUDIO_H
#include LMMS_SDL_SDL_H
#include LMMS_SDL_SDL_AUDIO_H
#include "audio_device.h"

11
include/clipboard.h
View File

@@ -1,7 +1,7 @@
/*
* clipboard.h - the clipboard for patterns, notes etc.
*
* Copyright (c) 2004-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -26,10 +26,6 @@
#ifndef _CLIPBOARD_H
#define _CLIPBOARD_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <QtCore/QMap>
#include <Qt/QtXml>
@@ -41,9 +37,8 @@ class clipboard
public:
typedef QMap<QString, QDomElement> map;
static void FASTCALL copy( journallingObject * _object );
static const QDomElement * FASTCALL getContent(
const QString & _node_name );
static void copy( journallingObject * _object );
static const QDomElement * getContent( const QString & _node_name );
static const char * mimeType( void )
{

9
include/config_mgr.h
View File

@@ -26,10 +26,7 @@
#ifndef _CONFIG_MGR_H
#define _CONFIG_MGR_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#include <QtCore/QMap>
#include <QtCore/QVector>
@@ -141,7 +138,7 @@ public:
return( m_ladDir );
}
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
const QString & stkDir( void ) const
{
return( m_stkDir );
@@ -188,7 +185,7 @@ private:
QString m_vstDir;
QString m_flDir;
QString m_ladDir;
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
QString m_stkDir;
#endif
QStringList m_recentlyOpenedProjects;

6
include/debug.h
View File

@@ -1,7 +1,7 @@
/*
* debug.h - header file to be included for debugging purposes
*
* Copyright (c) 2004-2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -26,9 +26,7 @@
#ifndef _DEBUG_H
#define _DEBUG_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
// set whether debug-stuff (like messages on the console, asserts and other
// additional range-checkings) should be compiled

4
include/effect.h
View File

@@ -27,10 +27,6 @@
#ifndef _EFFECT_H
#define _EFFECT_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <Qt/QtXml>
#include "plugin.h"

4
include/endian_handling.h
View File

@@ -26,10 +26,6 @@
#ifndef _ENDIAN_HANDLING_H
#define _ENDIAN_HANDLING_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <QtCore/QSysInfo>
#include "types.h"

4
include/engine.h
View File

@@ -26,9 +26,7 @@
#ifndef _ENGINE_H
#define _ENGINE_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#include <QtCore/QMap>

7
include/export.h
View File

@@ -26,12 +26,9 @@
#ifndef _EXPORT_H
#define _EXPORT_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifdef BUILD_WIN32
#ifdef LMMS_BUILD_WIN32
#ifdef PLUGIN_NAME
#define EXPORT __declspec(dllimport)

4
include/fx_mixer.h
View File

@@ -26,10 +26,6 @@
#ifndef _FX_MIXER_H
#define _FX_MIXER_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "mv_base.h"
#include "mixer.h"
#include "effect_chain.h"

7
include/import_filter.h
View File

@@ -46,7 +46,7 @@ public:
// tries to import given file to given track-container by having all
// available import-filters to try to import the file
static void FASTCALL import( const QString & _file_to_import,
static void import( const QString & _file_to_import,
trackContainer * _tc );
@@ -85,12 +85,11 @@ protected:
m_file.ungetChar( _ch );
}
virtual void FASTCALL saveSettings( QDomDocument &,
QDomElement & )
virtual void saveSettings( QDomDocument &, QDomElement & )
{
}
virtual void FASTCALL loadSettings( const QDomElement & )
virtual void loadSettings( const QDomElement & )
{
}

20
include/ladspa_control.h
View File

@@ -25,11 +25,9 @@
#ifndef _LADSPA_CONTROL_H
#define _LADSPA_CONTROL_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifdef HAVE_LADSPA_H
#ifdef LMMS_HAVE_LADSPA_H
#include <ladspa.h>
#else
#include "ladspa-1.1.h"
@@ -56,11 +54,11 @@ public:
~ladspaControl();
LADSPA_Data getValue( void );
void FASTCALL setValue( LADSPA_Data _value );
void FASTCALL setLink( bool _state );
void setValue( LADSPA_Data _value );
void setLink( bool _state );
void FASTCALL linkControls( ladspaControl * _control );
void FASTCALL unlinkControls( ladspaControl * _control );
void linkControls( ladspaControl * _control );
void unlinkControls( ladspaControl * _control );
inline boolModel * getToggledModel( void )
{
@@ -82,9 +80,9 @@ public:
return( m_port );
}
virtual void FASTCALL saveSettings( QDomDocument & _doc,
QDomElement & _parent, const QString & _name );
virtual void FASTCALL loadSettings( const QDomElement & _this,
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent,
const QString & _name );
virtual void loadSettings( const QDomElement & _this,
const QString & _name );
inline virtual QString nodeName( void ) const
{

83
include/ladspa_manager.h
View File

@@ -28,11 +28,9 @@
#ifndef _LADSPA_MANAGER_H
#define _LADSPA_MANAGER_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifdef HAVE_LADSPA_H
#ifdef LMMS_HAVE_LADSPA_H
#include <ladspa.h>
#else
#include "ladspa-1.1.h"
@@ -105,48 +103,47 @@ public:
types should be identified by file and label rather than by index
or plugin name, which may be changed in new plugin
versions. Labels must not contain white-space characters. */
QString FASTCALL getLabel( const ladspa_key_t & _plugin );
QString getLabel( const ladspa_key_t & _plugin );
/* Indicates that the plugin has a real-time dependency
(e.g. listens to a MIDI device) and so its output must not
be cached or subject to significant latency. */
bool FASTCALL hasRealTimeDependency( const ladspa_key_t & _plugin );
bool hasRealTimeDependency( const ladspa_key_t & _plugin );
/* Indicates that the plugin may cease to work correctly if the
host elects to use the same data location for both input and output
(see connectPort). */
bool FASTCALL isInplaceBroken( const ladspa_key_t & _plugin );
bool isInplaceBroken( const ladspa_key_t & _plugin );
/* Indicates that the plugin is capable of running not only in a
conventional host but also in a 'hard real-time' environment. */
bool FASTCALL isRealTimeCapable( const ladspa_key_t & _plugin );
bool isRealTimeCapable( const ladspa_key_t & _plugin );
/* Returns the name of the plug-in */
QString FASTCALL getName( const ladspa_key_t & _plugin );
QString getName( const ladspa_key_t & _plugin );
/* Returns the the plug-in's author */
QString FASTCALL getMaker( const ladspa_key_t & _plugin );
QString getMaker( const ladspa_key_t & _plugin );
/* Returns the copyright for the plug-in */
QString FASTCALL getCopyright( const ladspa_key_t & _plugin );
QString getCopyright( const ladspa_key_t & _plugin );
/* This indicates the number of ports (input AND output) present on
the plugin. */
Uint32 FASTCALL getPortCount( const ladspa_key_t & _plugin );
Uint32 getPortCount( const ladspa_key_t & _plugin );
/* Indicates that the port is an input. */
bool FASTCALL isPortInput( const ladspa_key_t & _plugin, Uint32 _port );
bool isPortInput( const ladspa_key_t & _plugin, Uint32 _port );
/* Indicates that the port is an output. */
bool FASTCALL isPortOutput( const ladspa_key_t & _plugin, Uint32 _port );
bool isPortOutput( const ladspa_key_t & _plugin, Uint32 _port );
/* Indicates that the port is an audio. */
bool FASTCALL isPortAudio( const ladspa_key_t & _plugin, Uint32 _port );
bool isPortAudio( const ladspa_key_t & _plugin, Uint32 _port );
/* Indicates that the port is an control. */
bool FASTCALL isPortControl( const ladspa_key_t & _plugin,
Uint32 _port );
bool isPortControl( const ladspa_key_t & _plugin, Uint32 _port );
/* Indicates that any bounds specified should be interpreted as
multiples of the sample rate. For instance, a frequency range from
@@ -154,50 +151,43 @@ public:
by this hint in conjunction with LowerBound = 0 and UpperBound = 0.5.
Hosts that support bounds at all must support this hint to retain
meaning. */
bool FASTCALL areHintsSampleRateDependent(
const ladspa_key_t & _plugin,
bool areHintsSampleRateDependent( const ladspa_key_t & _plugin,
Uint32 _port );
/* Returns the lower boundary value for the given port. If
no lower bound is provided by the plug-in, returns -999e-99. When
areHintsSampleRateDependent() is also true then this value should be
multiplied by the relevant sample rate. */
float FASTCALL getLowerBound( const ladspa_key_t & _plugin,
Uint32 _port );
float getLowerBound( const ladspa_key_t & _plugin, Uint32 _port );
/* Returns the upper boundary value for the given port. If
no upper bound is provided by the plug-in, returns -999e-99. When
areHintsSampleRateDependent() is also true then this value should be
multiplied by the relevant sample rate. */
float FASTCALL getUpperBound( const ladspa_key_t & _plugin,
Uint32 _port );
float getUpperBound( const ladspa_key_t & _plugin, Uint32 _port );
/* Indicates whether the given port should be considered 0 or 1
boolean switch. */
bool FASTCALL isPortToggled( const ladspa_key_t & _plugin,
Uint32 _port );
bool isPortToggled( const ladspa_key_t & _plugin, Uint32 _port );
/* Retrieves any default setting hints offered by the plug-in for
the given port. */
float FASTCALL getDefaultSetting( const ladspa_key_t & _plugin,
Uint32 _port );
float getDefaultSetting( const ladspa_key_t & _plugin, Uint32 _port );
/* Indicates that it is likely that the user will find it more
intuitive to view values using a logarithmic scale. This is
particularly useful for frequencies and gains. */
bool FASTCALL isLogarithmic( const ladspa_key_t & _plugin,
Uint32 _port );
bool isLogarithmic( const ladspa_key_t & _plugin, Uint32 _port );
/* Indicates that a user interface would probably wish to provide a
stepped control taking only integer values. Any bounds set should be
slightly wider than the actual integer range required to avoid floating
point rounding errors. For instance, the integer set {0,1,2,3} might
be described as [-0.1, 3.1]. */
bool FASTCALL isInteger( const ladspa_key_t & _plugin, Uint32 _port );
bool isInteger( const ladspa_key_t & _plugin, Uint32 _port );
/* Returns the name of the port. */
QString FASTCALL getPortName( const ladspa_key_t & _plugin,
Uint32 _port );
QString getPortName( const ladspa_key_t & _plugin, Uint32 _port );
/* This may be used by the plugin developer to pass any custom
@@ -205,13 +195,13 @@ public:
or interpreted by the host. It is expected that most plugin
writers will not use this facility as LADSPA_Handle should be
used to hold instance data. */
const void * FASTCALL getImplementationData(
const void * getImplementationData(
const ladspa_key_t & _plugin );
/* Returns a pointer to the plug-in's descriptor from which control
of the plug-in is accessible */
const LADSPA_Descriptor * FASTCALL getDescriptor(
const LADSPA_Descriptor * getDescriptor(
const ladspa_key_t & _plugin );
@@ -222,7 +212,7 @@ public:
/* Returns a handle to an instantiation of the given plug-in. */
LADSPA_Handle FASTCALL instantiate( const ladspa_key_t & _plugin,
LADSPA_Handle instantiate( const ladspa_key_t & _plugin,
Uint32 _sample_rate );
/* This method calls a function pointer that connects a port on an
@@ -242,7 +232,7 @@ public:
connectPort() must be called at least once for each port before
run() or runAdding() is called. */
bool FASTCALL connectPort( const ladspa_key_t & _plugin,
bool connectPort( const ladspa_key_t & _plugin,
LADSPA_Handle _instance,
Uint32 _port,
LADSPA_Data * _data_location );
@@ -266,7 +256,7 @@ public:
called again unless deactivate() is called first. Note that
connectPort() may be called before or after a call to
activate(). */
bool FASTCALL activate( const ladspa_key_t & _plugin,
bool activate( const ladspa_key_t & _plugin,
LADSPA_Handle _instance );
/* This method calls a function pointer that runs an instance of a
@@ -279,7 +269,7 @@ public:
before run() or run_adding(). If deactivate() is called for a
plugin instance then the plugin instance may not be reused until
activate() has been called again. */
bool FASTCALL run( const ladspa_key_t & _plugin,
bool run( const ladspa_key_t & _plugin,
LADSPA_Handle _instance,
Uint32 _sample_count );
@@ -296,7 +286,7 @@ public:
runAdding() is optional. When it is not provided by a plugin,
this function pointer must be set to NULL. When it is provided,
the function setRunAddingGain() must be provided also. */
bool FASTCALL runAdding( const ladspa_key_t & _plugin,
bool runAdding( const ladspa_key_t & _plugin,
LADSPA_Handle _instance,
Uint32 _sample_count );
@@ -309,7 +299,7 @@ public:
This function should be provided by the plugin if and only if the
runAdding() function is provided. When it is absent this
function pointer must be set to NULL. */
bool FASTCALL setRunAddingGain( const ladspa_key_t & _plugin,
bool setRunAddingGain( const ladspa_key_t & _plugin,
LADSPA_Handle _instance,
LADSPA_Data _gain );
@@ -326,7 +316,7 @@ public:
Deactivation is not similar to pausing as the plugin instance
will be reinitialised when activate() is called to reuse it. */
bool FASTCALL deactivate( const ladspa_key_t & _plugin,
bool deactivate( const ladspa_key_t & _plugin,
LADSPA_Handle _instance );
/* Once an instance of a plugin has been finished with it can be
@@ -336,17 +326,14 @@ public:
If activate() was called for a plugin instance then a
corresponding call to deactivate() must be made before cleanup()
is called. */
bool FASTCALL cleanup( const ladspa_key_t & _plugin,
bool cleanup( const ladspa_key_t & _plugin,
LADSPA_Handle _instance );
private:
void FASTCALL addPlugins(
LADSPA_Descriptor_Function _descriptor_func,
void addPlugins( LADSPA_Descriptor_Function _descriptor_func,
const QString & _file );
Uint16 FASTCALL getPluginInputs(
const LADSPA_Descriptor * _descriptor );
Uint16 FASTCALL getPluginOutputs(
const LADSPA_Descriptor * _descriptor );
Uint16 getPluginInputs( const LADSPA_Descriptor * _descriptor );
Uint16 getPluginOutputs( const LADSPA_Descriptor * _descriptor );
typedef QMap<ladspa_key_t, ladspaManagerDescription *>
ladspaManagerMapType;

6
include/micro_timer.h
View File

@@ -26,11 +26,9 @@
#ifndef _MICRO_TIMER
#define _MICRO_TIMER
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifdef HAVE_SYS_TIME_H
#ifdef LMMS_HAVE_SYS_TIME_H
#include <sys/time.h>
#endif

8
include/midi_alsa_raw.h
View File

@@ -1,7 +1,7 @@
/*
* midi_alsa_raw.h - midi-client for RawMIDI via ALSA
*
* Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -26,11 +26,9 @@
#ifndef _MIDI_ALSA_RAW_H
#define _MIDI_ALSA_RAW_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifdef HAVE_ALSA_ASOUNDLIB_H
#ifdef LMMS_HAVE_ALSA_ASOUNDLIB_H
#ifndef ALSA_SUPPORT
#define ALSA_SUPPORT

8
include/midi_alsa_seq.h
View File

@@ -1,7 +1,7 @@
/*
* midi_alsa_seq.h - ALSA-sequencer-client
*
* Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -26,11 +26,9 @@
#ifndef _MIDI_ALSA_SEQ_H
#define _MIDI_ALSA_SEQ_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifdef HAVE_ALSA_ASOUNDLIB_H
#ifdef LMMS_HAVE_ALSA_ASOUNDLIB_H
#ifndef ALSA_SUPPORT
#define ALSA_SUPPORT

2
include/midi_dummy.h
View File

@@ -75,7 +75,7 @@ public:
protected:
virtual void FASTCALL sendByte( const Uint8 )
virtual void sendByte( const Uint8 )
{
}

10
include/midi_event_processor.h
View File

@@ -26,12 +26,6 @@
#ifndef _MIDI_EVENT_PROCESSOR_H
#define _MIDI_EVENT_PROCESSOR_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <QtCore/Qt>
class midiEvent;
class midiTime;
@@ -49,10 +43,10 @@ public:
}
// to be implemented by inheriting classes
virtual void FASTCALL processInEvent( const midiEvent & _me,
virtual void processInEvent( const midiEvent & _me,
const midiTime & _time,
bool _lock = TRUE ) = 0;
virtual void FASTCALL processOutEvent( const midiEvent & _me,
virtual void processOutEvent( const midiEvent & _me,
const midiTime & _time ) = 0;
} ;

14
include/mixer.h
View File

@@ -26,14 +26,16 @@
#ifndef _MIXER_H
#define _MIXER_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifndef USE_3RDPARTY_LIBSRC
#ifndef LMMS_USE_3RDPARTY_LIBSRC
#include <samplerate.h>
#else
#ifndef OUT_OF_TREE_BUILD
#include "src/3rdparty/samplerate/samplerate.h"
#else
#include <samplerate.h>
#endif
#endif
@@ -58,7 +60,7 @@ const fpp_t DEFAULT_BUFFER_SIZE = 256;
const ch_cnt_t DEFAULT_CHANNELS = 2;
const ch_cnt_t SURROUND_CHANNELS =
#ifndef DISABLE_SURROUND
#ifndef LMMS_DISABLE_SURROUND
4;
#else
2;
@@ -369,7 +371,7 @@ public:
static void clearAudioBuffer( sampleFrame * _ab,
const f_cnt_t _frames,
const f_cnt_t _offset = 0 );
#ifndef DISABLE_SURROUND
#ifndef LMMS_DISABLE_SURROUND
static void clearAudioBuffer( surroundSampleFrame * _ab,
const f_cnt_t _frames,
const f_cnt_t _offset = 0 );

4
include/note.h
View File

@@ -29,10 +29,6 @@
#include <QtCore/QVector>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "volume.h"
#include "panning.h"
#include "midi_time.h"

4
include/nstate_button.h
View File

@@ -26,10 +26,6 @@
#ifndef _NSTATE_BUTTON_H
#define _NSTATE_BUTTON_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <QtGui/QPixmap>
#include <QtCore/QVector>
#include <QtCore/QPair>

8
include/oscillator.h
View File

@@ -26,11 +26,9 @@
#ifndef _OSCILLATOR_H
#define _OSCILLATOR_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifdef HAVE_STDLIB_H
#ifdef LMMS_HAVE_STDLIB_H
#include <stdlib.h>
#endif
@@ -207,7 +205,7 @@ private:
template<WaveShapes W>
inline sample_t getSample( const float _sample );
inline void FASTCALL recalcPhase( void );
inline void recalcPhase( void );
} ;

15
include/piano_roll.h
View File

@@ -2,7 +2,7 @@
* piano_roll.h - declaration of class pianoRoll which is a window where you
* can set and edit notes in an easy way
*
* Copyright (c) 2004-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -50,7 +50,7 @@ class pianoRoll : public QWidget, public journallingObject
{
Q_OBJECT
public:
void FASTCALL setCurrentPattern( pattern * _new_pattern );
void setCurrentPattern( pattern * _new_pattern );
inline bool isRecording( void ) const
{
@@ -70,9 +70,8 @@ public:
int quantization( void ) const;
virtual void FASTCALL saveSettings( QDomDocument & _doc,
QDomElement & _parent );
virtual void FASTCALL loadSettings( const QDomElement & _this );
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
inline virtual QString nodeName( void ) const
{
return( "pianoroll" );
@@ -90,18 +89,18 @@ protected:
virtual void paintEvent( QPaintEvent * _pe );
virtual void resizeEvent( QResizeEvent * _re );
virtual void wheelEvent( QWheelEvent * _we );
#ifdef BUILD_LINUX
#ifdef LMMS_BUILD_LINUX
virtual bool x11Event( XEvent * _xe );
#endif
int FASTCALL getKey( int _y ) const;
int getKey( int _y ) const;
static inline void drawNoteRect( QPainter & _p, int _x, int _y,
int _width,
const bool _is_selected,
const bool _is_step_note );
void removeSelection( void );
void selectAll( void );
void FASTCALL getSelectedNotes( noteVector & _selected_notes );
void getSelectedNotes( noteVector & _selected_notes );
protected slots:

17
include/sample_buffer.h
View File

@@ -29,17 +29,6 @@
#include <QtCore/QObject>
#include <QtCore/QRect>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifndef USE_3RDPARTY_LIBSRC
#include <samplerate.h>
#else
#include "src/3rdparty/samplerate/samplerate.h"
#endif
#include "mixer.h"
#include "interpolation.h"
#include "types.h"
@@ -211,17 +200,17 @@ private:
void update( bool _keep_settings = FALSE );
#ifdef SDL_SDL_SOUND_H
#ifdef LMMS_SDL_SDL_SOUND_H
f_cnt_t decodeSampleSDL( const char * _f, int_sample_t * & _buf,
ch_cnt_t _channels,
sample_rate_t _sample_rate );
#endif
#ifdef HAVE_SNDFILE_H
#ifdef LMMS_HAVE_SNDFILE_H
f_cnt_t decodeSampleSF( const char * _f, int_sample_t * & _buf,
ch_cnt_t & _channels,
sample_rate_t & _sample_rate );
#endif
#ifdef HAVE_VORBIS_VORBISFILE_H
#ifdef LMMS_HAVE_VORBIS_VORBISFILE_H
f_cnt_t decodeSampleOGGVorbis( const char * _f, int_sample_t * & _buf,
ch_cnt_t & _channels,
sample_rate_t & _sample_rate );

5
include/setup_dialog.h
View File

@@ -29,6 +29,7 @@
#include <QtGui/QDialog>
#include <QtCore/QMap>
#include "lmmsconfig.h"
#include "audio_device.h"
#include "midi_client.h"
@@ -127,7 +128,7 @@ private:
QLineEdit * m_adLineEdit;
QLineEdit * m_fdLineEdit;
QLineEdit * m_ladLineEdit;
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
QLineEdit * m_stkLineEdit;
#endif
@@ -136,7 +137,7 @@ private:
QString m_artworkDir;
QString m_flDir;
QString m_ladDir;
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
QString m_stkDir;
#endif

8
include/sweep_oscillator.h
View File

@@ -1,7 +1,7 @@
/*
* sweep_oscillator.h - sweep-oscillator
*
* Copyright (c) 2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -26,10 +26,6 @@
#ifndef _SWEEP_OSCILLATOR_H
#define _SWEEP_OSCILLATOR_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "oscillator.h"
#include "effect_lib.h"
@@ -72,7 +68,7 @@ private:
FX m_FX;
inline sample_t getSample( const float _sample );
inline void FASTCALL recalcPhase( void );
inline void recalcPhase( void );
} ;

16
include/tab_bar.h
View File

@@ -26,16 +26,12 @@
#ifndef _TAB_BAR_H
#define _TAB_BAR_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "export.h"
#include <QtCore/QMap>
#include <QtGui/QLayout>
#include <QtGui/QWidget>
#include "export.h"
class tabButton;
@@ -48,10 +44,10 @@ public:
QBoxLayout::Direction _dir = QBoxLayout::LeftToRight );
virtual ~tabBar();
tabButton * FASTCALL addTab( QWidget * _w, const QString & _text,
tabButton * addTab( QWidget * _w, const QString & _text,
int _id, bool _add_stretch = FALSE,
bool _text_is_tooltip = FALSE );
void FASTCALL removeTab( int _id );
void removeTab( int _id );
inline void setExclusive( bool _on )
{
@@ -66,8 +62,8 @@ public slots:
protected:
bool FASTCALL tabState( int _id );
void FASTCALL setTabState( int _id, bool _checked );
bool tabState( int _id );
void setTabState( int _id, bool _checked );
bool allHidden( void );

2
include/tool.h
View File

@@ -39,7 +39,7 @@ public:
// instantiate tool-plugin with given name or return NULL
// on failure
static tool * FASTCALL instantiate( const QString & _plugin_name,
static tool * instantiate( const QString & _plugin_name,
model * _parent );
} ;

9
include/track.h
View File

@@ -27,19 +27,10 @@
#ifndef _TRACK_H
#define _TRACK_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <QtCore/QVector>
#include <QtCore/QList>
#include <QtGui/QWidget>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "types.h"
#include "midi_time.h"
#include "rubberband.h"

6
include/volume.h
View File

@@ -26,9 +26,7 @@
#ifndef _VOLUME_H
#define _VOLUME_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#include "types.h"
@@ -44,7 +42,7 @@ typedef struct
typedef struct
{
#ifndef DISABLE_SURROUND
#ifndef LMMS_DISABLE_SURROUND
float vol[4];
#else
float vol[2];

2
plugins/ladspa_effect/caps/Makefile.am
View File

@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign 1.4
AM_CXXFLAGS := $(AM_CXXFLAGS) -O2 -I../../../include
AM_CXXFLAGS := $(AM_CXXFLAGS) -O3 -I../../../include
DEST = $(DESTDIR)$(libdir)/$(PACKAGE)/ladspa
SOURCES = $(wildcard *.cc)

6
plugins/ladspa_effect/caps/basics.h
View File

@@ -47,11 +47,9 @@
#include <stdio.h>
#include <stdint.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifdef HAVE_LADSPA_H
#ifdef LMMS_HAVE_LADSPA_H
#include <ladspa.h>
#else
#include "ladspa-1.1.h"

4
plugins/ladspa_effect/tap/Makefile.am
View File

@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign 1.4
AM_CFLAGS := $(AM_CFLAGS) -I../../../include -I. -O3 -Wall -fomit-frame-pointer -fno-strict-aliasing -fstrength-reduce -funroll-loops -ffast-math -c -fPIC -DPIC
AM_CFLAGS := $(AM_CFLAGS) $(CFLAGS) -I../../../include -I. -O3 -Wall -fomit-frame-pointer -fno-strict-aliasing -fstrength-reduce -funroll-loops -ffast-math -c -fPIC -DPIC
DEST = $(DESTDIR)$(libdir)/$(PACKAGE)/ladspa
@@ -55,4 +55,4 @@ uninstall:
all: $(PLUGINS)
EXTRA_DIST = README COPYING CREDITS $(wildcard tap_*.c) $(wildcard tap_*.h) ladspa.h
EXTRA_DIST = README COPYING CREDITS $(wildcard tap_*.c) $(wildcard tap_*.h) ladspa-local.h

8
plugins/ladspa_effect/tap/ladspa.h → plugins/ladspa_effect/tap/ladspa-local.h
View File

@@ -1,5 +1,5 @@
/*
* ladspa.h - include correct LADSPA-header
* ladspa-local.h - include correct LADSPA-header
*
* Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
@@ -23,11 +23,9 @@
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifdef HAVE_LADSPA_H
#ifdef LMMS_HAVE_LADSPA_H
#include <ladspa.h>
#else
#include "ladspa-1.1.h"

2
plugins/ladspa_effect/tap/tap_autopan.c
View File

@@ -27,7 +27,7 @@
#include <string.h>
#include <math.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"
/* The Unique ID of the plugin: */

2
plugins/ladspa_effect/tap/tap_chorusflanger.c
View File

@@ -25,7 +25,7 @@
#include <math.h>
#include <time.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"

2
plugins/ladspa_effect/tap/tap_deesser.c
View File

@@ -24,7 +24,7 @@
#include <string.h>
#include <math.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"
/* The Unique ID of the plugin: */

2
plugins/ladspa_effect/tap/tap_doubler.c
View File

@@ -25,7 +25,7 @@
#include <math.h>
#include <time.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"

2
plugins/ladspa_effect/tap/tap_dynamics_m.c
View File

@@ -25,7 +25,7 @@
#include <string.h>
#include <math.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"

2
plugins/ladspa_effect/tap/tap_dynamics_st.c
View File

@@ -25,7 +25,7 @@
#include <string.h>
#include <math.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"

2
plugins/ladspa_effect/tap/tap_echo.c
View File

@@ -24,7 +24,7 @@
#include <string.h>
#include <math.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"
/* The Unique ID of the plugin: */

2
plugins/ladspa_effect/tap/tap_eq.c
View File

@@ -29,7 +29,7 @@ bugs or malfunction. */
#include <string.h>
#include <math.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"
/* The Unique ID of the plugin */

2
plugins/ladspa_effect/tap/tap_eqbw.c
View File

@@ -27,7 +27,7 @@
#include <string.h>
#include <math.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"
/* The Unique ID of the plugin */

2
plugins/ladspa_effect/tap/tap_limiter.c
View File

@@ -24,7 +24,7 @@
#include <string.h>
#include <math.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"
/* The Unique ID of the plugin: */

2
plugins/ladspa_effect/tap/tap_pinknoise.c
View File

@@ -25,7 +25,7 @@
#include <math.h>
#include <time.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"
/* The Unique ID of the plugin: */

2
plugins/ladspa_effect/tap/tap_pitch.c
View File

@@ -24,7 +24,7 @@
#include <string.h>
#include <math.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"

2
plugins/ladspa_effect/tap/tap_reflector.c
View File

@@ -24,7 +24,7 @@
#include <string.h>
#include <math.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"

2
plugins/ladspa_effect/tap/tap_reverb.c
View File

@@ -24,7 +24,7 @@
#include <string.h>
#include <math.h>
#include "ladspa.h"
#include "ladspa-local.h"
/* ***** VERY IMPORTANT! *****

2
plugins/ladspa_effect/tap/tap_rotspeak.c
View File

@@ -24,7 +24,7 @@
#include <string.h>
#include <math.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"
/* The Unique ID of the plugin: */

2
plugins/ladspa_effect/tap/tap_sigmoid.c
View File

@@ -24,7 +24,7 @@
#include <string.h>
#include <math.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"

2
plugins/ladspa_effect/tap/tap_tremolo.c
View File

@@ -24,7 +24,7 @@
#include <string.h>
#include <math.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"
/* The Unique ID of the plugin: */

2
plugins/ladspa_effect/tap/tap_tubewarmth.c
View File

@@ -24,7 +24,7 @@
#include <string.h>
#include <math.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"

2
plugins/ladspa_effect/tap/tap_vibrato.c
View File

@@ -24,7 +24,7 @@
#include <string.h>
#include <math.h>
#include "ladspa.h"
#include "ladspa-local.h"
#include "tap_utils.h"

10
plugins/midi_import/midi_import.h
View File

@@ -26,10 +26,6 @@
#ifndef _MIDI_IMPORT_H
#define _MIDI_IMPORT_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <QtCore/QString>
#include <QtCore/QPair>
#include <QtCore/QVector>
@@ -53,9 +49,9 @@ public:
private:
virtual bool tryImport( trackContainer * _tc );
bool FASTCALL readSMF( trackContainer * _tc );
bool FASTCALL readRIFF( trackContainer * _tc );
bool FASTCALL readTrack( int _track_end, QString & _track_name );
bool readSMF( trackContainer * _tc );
bool readRIFF( trackContainer * _tc );
bool readTrack( int _track_end, QString & _track_name );
void error( void );

8
plugins/vst_base/communication.h
View File

@@ -2,7 +2,7 @@
* communication.h - header file defining stuff concerning communication between
* LVSL-server and -client
*
* Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -27,11 +27,9 @@
#ifndef _COMMUNICATION_H
#define _COMMUNICATION_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifdef HAVE_UNISTD_H
#ifdef LMMS_HAVE_UNISTD_H
#include <unistd.h>
#endif

19
plugins/vst_base/lvsl_client.cpp
View File

@@ -24,6 +24,7 @@
#include "lvsl_client.h"
#include "lmmsconfig.h"
#include <QtCore/QLocale>
#include <QtCore/QTime>
@@ -33,37 +34,33 @@
#include <QtGui/QX11EmbedContainer>
#include <QtGui/QX11Info>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_UNISTD_H
#ifdef LMMS_HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_SIGNAL_H
#ifdef LMMS_HAVE_SIGNAL_H
#include <signal.h>
#endif
#include <cstdio>
#ifdef HAVE_SYS_IPC_H
#ifdef LMMS_HAVE_SYS_IPC_H
#include <sys/ipc.h>
#endif
#ifdef HAVE_SYS_SHM_H
#ifdef LMMS_HAVE_SYS_SHM_H
#include <sys/shm.h>
#endif
#ifdef HAVE_SYS_SELECT_H
#ifdef LMMS_HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
#ifdef HAVE_SYS_TIME_H
#ifdef LMMS_HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_SYS_WAIT_H
#ifdef LMMS_HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif

26
plugins/vst_base/lvsl_server.cpp
View File

@@ -28,35 +28,33 @@
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#ifdef HAVE_PTHREAD_H
#ifdef LMMS_HAVE_PTHREAD_H
#include <pthread.h>
#endif
#ifdef HAVE_SYS_TYPES_H
#ifdef LMMS_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_IPC_H
#ifdef LMMS_HAVE_SYS_IPC_H
#include <sys/ipc.h>
#endif
#ifdef HAVE_SYS_SHM_H
#ifdef LMMS_HAVE_SYS_SHM_H
#include <sys/shm.h>
#endif
#ifdef HAVE_STDARG_H
#ifdef LMMS_HAVE_STDARG_H
#include <stdarg.h>
#endif
#ifdef HAVE_SIGNAL_H
#ifdef LMMS_HAVE_SIGNAL_H
#include <signal.h>
#endif
#ifdef HAVE_SCHED_H
#ifdef LMMS_HAVE_SCHED_H
#include <sched.h>
#endif
@@ -94,7 +92,7 @@ struct ERect
#include "communication.h"
#ifdef HAVE_TLS
#ifdef LMMS_HAVE_TLS
static __thread int ejmpbuf_valid = false;
static __thread jmp_buf ejmpbuf;
#else
@@ -1027,7 +1025,7 @@ DWORD WINAPI VSTPlugin::guiEventLoop( LPVOID _param )
_this->m_guiThreadID = GetCurrentThreadId();
// "guard point" to trap errors that occur during plugin loading
#ifdef HAVE_TLS
#ifdef LMMS_HAVE_TLS
if( sigsetjmp( ejmpbuf, 1 ) )
{
lvsMessage( "creating the editor for %s failed",
@@ -1105,7 +1103,7 @@ DWORD WINAPI VSTPlugin::guiEventLoop( LPVOID _param )
SWP_NOOWNERZORDER | SWP_NOZORDER
#endif
);
#ifdef HAVE_TLS
#ifdef LMMS_HAVE_TLS
ejmpbuf_valid = false;
#else
*ejmpbuf_valid = false;
@@ -1177,7 +1175,7 @@ int main( void )
return( -1 );
}
#ifdef HAVE_SCHED_H
#ifdef LMMS_HAVE_SCHED_H
// try to set realtime-priority
struct sched_param sparam;
sparam.sched_priority = ( sched_get_priority_max( SCHED_FIFO ) +

14
src/core/audio/audio_oss.cpp
View File

@@ -40,27 +40,27 @@
#include "templates.h"
#ifdef HAVE_CONFIG_H
#ifdef LMMS_HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_UNISTD_H
#ifdef LMMS_HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_FCNTL_H
#ifdef LMMS_HAVE_FCNTL_H
#include <fcntl.h>
#endif
#ifdef HAVE_SYS_IOCTL_H
#ifdef LMMS_HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
#ifdef HAVE_STDLIB_H
#ifdef LMMS_HAVE_STDLIB_H
#include <stdlib.h>
#endif
#ifdef HAVE_SYS_SOUNDCARD_H
#ifdef LMMS_HAVE_SYS_SOUNDCARD_H
// This is recommended by OSS
#include <sys/soundcard.h>
#elif HAVE_SOUNDCARD_H
#elif LMMS_HAVE_SOUNDCARD_H
// This is installed on some systems
#include <soundcard.h>
#endif

20
src/core/config_mgr.cpp
View File

@@ -25,10 +25,6 @@
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <Qt/QtXml>
#include <QtCore/QDir>
#include <QtCore/QFile>
@@ -50,7 +46,7 @@ configManager::configManager( void ) :
m_workingDir( QDir::home().absolutePath() + QDir::separator() +
"lmms" ),
m_dataDir( qApp->applicationDirPath()
#ifdef BUILD_WIN32
#ifdef LMMS_BUILD_WIN32
+ QDir::separator() + "data" + QDir::separator()
#else
.section( '/', 0, -2 ) + "/share/lmms/"
@@ -58,7 +54,7 @@ configManager::configManager( void ) :
),
m_artworkDir( defaultArtworkDir() ),
m_pluginDir( qApp->applicationDirPath()
#ifdef BUILD_WIN32
#ifdef LMMS_BUILD_WIN32
+ QDir::separator() + "plugins" + QDir::separator()
#else
.section( '/', 0, -2 ) + "/lib/lmms/"
@@ -136,7 +132,7 @@ void configManager::setLADSPADir( const QString & _fd )
void configManager::setSTKDir( const QString & _fd )
{
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
m_stkDir = _fd;
#endif
}
@@ -314,7 +310,7 @@ bool configManager::loadConfigFile( void )
m_vstDir = value( "paths", "vstdir" );
m_flDir = value( "paths", "fldir" );
m_ladDir = value( "paths", "laddir" );
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
m_stkDir = value( "paths", "stkdir" );
#endif
@@ -330,14 +326,14 @@ bool configManager::loadConfigFile( void )
if( m_ladDir == "" )
{
#ifdef BUILD_WIN32
#ifdef LMMS_BUILD_WIN32
m_ladDir = m_pluginDir + "ladspa" + QDir::separator();
#else
m_ladDir = "/usr/lib/ladspa/:/usr/local/lib/ladspa/";
#endif
}
#ifdef HAVE_STK_H
#ifdef LMMS_LMMS_HAVE_STK_H
if( m_stkDir == "" )
{
m_stkDir = "/usr/share/stk/rawwaves/";
@@ -360,14 +356,14 @@ void configManager::saveConfigFile( void )
setValue( "paths", "vstdir", m_vstDir );
setValue( "paths", "fldir", m_flDir );
setValue( "paths", "laddir", m_ladDir );
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
setValue( "paths", "stkdir", m_stkDir );
#endif
QDomDocument doc( "lmms-config-file" );
QDomElement lmms_config = doc.createElement( "lmms" );
lmms_config.setAttribute( "version", VERSION );
lmms_config.setAttribute( "version", LMMS_VERSION );
doc.appendChild( lmms_config );
for( settingsMap::iterator it = m_settings.begin();

8
src/core/envelope_and_lfo_parameters.cpp
View File

@@ -238,7 +238,7 @@ void envelopeAndLFOParameters::resetLFO( void )
inline void FASTCALL envelopeAndLFOParameters::fillLFOLevel( float * _buf,
inline void envelopeAndLFOParameters::fillLFOLevel( float * _buf,
f_cnt_t _frame,
const fpp_t _frames )
{
@@ -272,9 +272,9 @@ inline void FASTCALL envelopeAndLFOParameters::fillLFOLevel( float * _buf,
void FASTCALL envelopeAndLFOParameters::fillLevel( float * _buf, f_cnt_t _frame,
const f_cnt_t _release_begin,
const fpp_t _frames )
void envelopeAndLFOParameters::fillLevel( float * _buf, f_cnt_t _frame,
const f_cnt_t _release_begin,
const fpp_t _frames )
{
if( _frame < 0 || _release_begin < 0 )
{

10
src/core/ladspa_control.cpp
View File

@@ -162,7 +162,7 @@ void ladspaControl::setValue( LADSPA_Data _value )
void FASTCALL ladspaControl::saveSettings( QDomDocument & _doc,
void ladspaControl::saveSettings( QDomDocument & _doc,
QDomElement & _this,
const QString & _name )
{
@@ -190,7 +190,7 @@ void FASTCALL ladspaControl::saveSettings( QDomDocument & _doc,
void FASTCALL ladspaControl::loadSettings( const QDomElement & _this,
void ladspaControl::loadSettings( const QDomElement & _this,
const QString & _name )
{
if( m_link )
@@ -218,7 +218,7 @@ void FASTCALL ladspaControl::loadSettings( const QDomElement & _this,
void FASTCALL ladspaControl::linkControls( ladspaControl * _control )
void ladspaControl::linkControls( ladspaControl * _control )
{
switch( m_port->data_type )
{
@@ -270,7 +270,7 @@ void ladspaControl::tempoKnobChanged( void )
void FASTCALL ladspaControl::unlinkControls( ladspaControl * _control )
void ladspaControl::unlinkControls( ladspaControl * _control )
{
switch( m_port->data_type )
{
@@ -303,7 +303,7 @@ void ladspaControl::linkStateChanged( void )
void FASTCALL ladspaControl::setLink( bool _state )
void ladspaControl::setLink( bool _state )
{
m_linkEnabledModel.setValue( _state );
}

70
src/core/ladspa_manager.cpp
View File

@@ -41,7 +41,7 @@ ladspaManager::ladspaManager( void )
split( ':' );
ladspaDirectories += configManager::inst()->ladspaDir().split( ':' );
#ifndef BUILD_WIN32
#ifndef LMMS_BUILD_WIN32
ladspaDirectories.push_back( "/usr/lib/lmms/ladspa" );
ladspaDirectories.push_back( "/usr/local/lib/lmms/ladspa" );
ladspaDirectories.push_back( "/usr/lib/ladspa" );
@@ -58,7 +58,7 @@ ladspaManager::ladspaManager( void )
{
const QFileInfo & f = *file;
if( !f.isFile() ||
#ifdef BUILD_WIN32
#ifdef LMMS_BUILD_WIN32
f.fileName().right(3) != "dll"
#else
f.fileName().right(2) != "so"
@@ -124,7 +124,7 @@ ladspaManagerDescription * ladspaManager::getDescription(
void FASTCALL ladspaManager::addPlugins(
void ladspaManager::addPlugins(
LADSPA_Descriptor_Function _descriptor_func,
const QString & _file )
{
@@ -173,7 +173,7 @@ void FASTCALL ladspaManager::addPlugins(
Uint16 FASTCALL ladspaManager::getPluginInputs(
Uint16 ladspaManager::getPluginInputs(
const LADSPA_Descriptor * _descriptor )
{
Uint16 inputs = 0;
@@ -199,7 +199,7 @@ Uint16 FASTCALL ladspaManager::getPluginInputs(
Uint16 FASTCALL ladspaManager::getPluginOutputs(
Uint16 ladspaManager::getPluginOutputs(
const LADSPA_Descriptor * _descriptor )
{
Uint16 outputs = 0;
@@ -233,7 +233,7 @@ l_sortable_plugin_t ladspaManager::getSortedPlugins()
QString FASTCALL ladspaManager::getLabel( const ladspa_key_t & _plugin )
QString ladspaManager::getLabel( const ladspa_key_t & _plugin )
{
if( m_ladspaManagerMap.contains( _plugin ) )
{
@@ -253,7 +253,7 @@ QString FASTCALL ladspaManager::getLabel( const ladspa_key_t & _plugin )
bool FASTCALL ladspaManager::hasRealTimeDependency(
bool ladspaManager::hasRealTimeDependency(
const ladspa_key_t & _plugin )
{
if( m_ladspaManagerMap.contains( _plugin ) )
@@ -274,7 +274,7 @@ bool FASTCALL ladspaManager::hasRealTimeDependency(
bool FASTCALL ladspaManager::isInplaceBroken( const ladspa_key_t & _plugin )
bool ladspaManager::isInplaceBroken( const ladspa_key_t & _plugin )
{
if( m_ladspaManagerMap.contains( _plugin ) )
{
@@ -294,7 +294,7 @@ bool FASTCALL ladspaManager::isInplaceBroken( const ladspa_key_t & _plugin )
bool FASTCALL ladspaManager::isRealTimeCapable(
bool ladspaManager::isRealTimeCapable(
const ladspa_key_t & _plugin )
{
if( m_ladspaManagerMap.contains( _plugin ) )
@@ -315,7 +315,7 @@ bool FASTCALL ladspaManager::isRealTimeCapable(
QString FASTCALL ladspaManager::getName( const ladspa_key_t & _plugin )
QString ladspaManager::getName( const ladspa_key_t & _plugin )
{
if( m_ladspaManagerMap.contains( _plugin ) )
{
@@ -335,7 +335,7 @@ QString FASTCALL ladspaManager::getName( const ladspa_key_t & _plugin )
QString FASTCALL ladspaManager::getMaker( const ladspa_key_t & _plugin )
QString ladspaManager::getMaker( const ladspa_key_t & _plugin )
{
if( m_ladspaManagerMap.contains( _plugin ) )
{
@@ -355,7 +355,7 @@ QString FASTCALL ladspaManager::getMaker( const ladspa_key_t & _plugin )
QString FASTCALL ladspaManager::getCopyright( const ladspa_key_t & _plugin )
QString ladspaManager::getCopyright( const ladspa_key_t & _plugin )
{
if( m_ladspaManagerMap.contains( _plugin ) )
{
@@ -375,7 +375,7 @@ QString FASTCALL ladspaManager::getCopyright( const ladspa_key_t & _plugin )
Uint32 FASTCALL ladspaManager::getPortCount( const ladspa_key_t & _plugin )
Uint32 ladspaManager::getPortCount( const ladspa_key_t & _plugin )
{
if( m_ladspaManagerMap.contains( _plugin ) )
{
@@ -395,7 +395,7 @@ Uint32 FASTCALL ladspaManager::getPortCount( const ladspa_key_t & _plugin )
bool FASTCALL ladspaManager::isPortInput( const ladspa_key_t & _plugin,
bool ladspaManager::isPortInput( const ladspa_key_t & _plugin,
Uint32 _port )
{
if( m_ladspaManagerMap.contains( _plugin )
@@ -419,7 +419,7 @@ bool FASTCALL ladspaManager::isPortInput( const ladspa_key_t & _plugin,
bool FASTCALL ladspaManager::isPortOutput( const ladspa_key_t & _plugin,
bool ladspaManager::isPortOutput( const ladspa_key_t & _plugin,
Uint32 _port )
{
if( m_ladspaManagerMap.contains( _plugin )
@@ -443,7 +443,7 @@ bool FASTCALL ladspaManager::isPortOutput( const ladspa_key_t & _plugin,
bool FASTCALL ladspaManager::isPortAudio( const ladspa_key_t & _plugin,
bool ladspaManager::isPortAudio( const ladspa_key_t & _plugin,
Uint32 _port )
{
if( m_ladspaManagerMap.contains( _plugin )
@@ -467,7 +467,7 @@ bool FASTCALL ladspaManager::isPortAudio( const ladspa_key_t & _plugin,
bool FASTCALL ladspaManager::isPortControl( const ladspa_key_t & _plugin,
bool ladspaManager::isPortControl( const ladspa_key_t & _plugin,
Uint32 _port )
{
if( m_ladspaManagerMap.contains( _plugin )
@@ -491,7 +491,7 @@ bool FASTCALL ladspaManager::isPortControl( const ladspa_key_t & _plugin,
bool FASTCALL ladspaManager::areHintsSampleRateDependent(
bool ladspaManager::areHintsSampleRateDependent(
const ladspa_key_t & _plugin,
Uint32 _port )
{
@@ -516,7 +516,7 @@ bool FASTCALL ladspaManager::areHintsSampleRateDependent(
float FASTCALL ladspaManager::getLowerBound( const ladspa_key_t & _plugin,
float ladspaManager::getLowerBound( const ladspa_key_t & _plugin,
Uint32 _port )
{
if( m_ladspaManagerMap.contains( _plugin )
@@ -547,7 +547,7 @@ float FASTCALL ladspaManager::getLowerBound( const ladspa_key_t & _plugin,
float FASTCALL ladspaManager::getUpperBound( const ladspa_key_t & _plugin, Uint32 _port )
float ladspaManager::getUpperBound( const ladspa_key_t & _plugin, Uint32 _port )
{
if( m_ladspaManagerMap.contains( _plugin )
&& _port < getPortCount( _plugin ) )
@@ -577,7 +577,7 @@ float FASTCALL ladspaManager::getUpperBound( const ladspa_key_t & _plugin,
bool FASTCALL ladspaManager::isPortToggled( const ladspa_key_t & _plugin,
bool ladspaManager::isPortToggled( const ladspa_key_t & _plugin,
Uint32 _port )
{
if( m_ladspaManagerMap.contains( _plugin )
@@ -601,7 +601,7 @@ bool FASTCALL ladspaManager::isPortToggled( const ladspa_key_t & _plugin,
float FASTCALL ladspaManager::getDefaultSetting( const ladspa_key_t & _plugin,
float ladspaManager::getDefaultSetting( const ladspa_key_t & _plugin,
Uint32 _port )
{
if( m_ladspaManagerMap.contains( _plugin )
@@ -688,7 +688,7 @@ float FASTCALL ladspaManager::getDefaultSetting( const ladspa_key_t & _plugin,
bool FASTCALL ladspaManager::isLogarithmic( const ladspa_key_t & _plugin,
bool ladspaManager::isLogarithmic( const ladspa_key_t & _plugin,
Uint32 _port )
{
if( m_ladspaManagerMap.contains( _plugin )
@@ -712,7 +712,7 @@ bool FASTCALL ladspaManager::isLogarithmic( const ladspa_key_t & _plugin,
bool FASTCALL ladspaManager::isInteger( const ladspa_key_t & _plugin,
bool ladspaManager::isInteger( const ladspa_key_t & _plugin,
Uint32 _port )
{
if( m_ladspaManagerMap.contains( _plugin )
@@ -736,7 +736,7 @@ bool FASTCALL ladspaManager::isInteger( const ladspa_key_t & _plugin,
QString FASTCALL ladspaManager::getPortName( const ladspa_key_t & _plugin,
QString ladspaManager::getPortName( const ladspa_key_t & _plugin,
Uint32 _port )
{
if( m_ladspaManagerMap.contains( _plugin )
@@ -759,7 +759,7 @@ QString FASTCALL ladspaManager::getPortName( const ladspa_key_t & _plugin,
const void * FASTCALL ladspaManager::getImplementationData(
const void * ladspaManager::getImplementationData(
const ladspa_key_t & _plugin )
{
if( m_ladspaManagerMap.contains( _plugin ) )
@@ -780,7 +780,7 @@ const void * FASTCALL ladspaManager::getImplementationData(
const LADSPA_Descriptor * FASTCALL ladspaManager::getDescriptor(
const LADSPA_Descriptor * ladspaManager::getDescriptor(
const ladspa_key_t & _plugin )
{
if( m_ladspaManagerMap.contains( _plugin ) )
@@ -801,7 +801,7 @@ const LADSPA_Descriptor * FASTCALL ladspaManager::getDescriptor(
LADSPA_Handle FASTCALL ladspaManager::instantiate(
LADSPA_Handle ladspaManager::instantiate(
const ladspa_key_t & _plugin,
Uint32 _sample_rate )
{
@@ -824,7 +824,7 @@ LADSPA_Handle FASTCALL ladspaManager::instantiate(
bool FASTCALL ladspaManager::connectPort( const ladspa_key_t & _plugin,
bool ladspaManager::connectPort( const ladspa_key_t & _plugin,
LADSPA_Handle _instance,
Uint32 _port,
LADSPA_Data * _data_location )
@@ -850,7 +850,7 @@ bool FASTCALL ladspaManager::connectPort( const ladspa_key_t & _plugin,
bool FASTCALL ladspaManager::activate( const ladspa_key_t & _plugin,
bool ladspaManager::activate( const ladspa_key_t & _plugin,
LADSPA_Handle _instance )
{
if( m_ladspaManagerMap.contains( _plugin ) )
@@ -872,7 +872,7 @@ bool FASTCALL ladspaManager::activate( const ladspa_key_t & _plugin,
bool FASTCALL ladspaManager::run( const ladspa_key_t & _plugin,
bool ladspaManager::run( const ladspa_key_t & _plugin,
LADSPA_Handle _instance,
Uint32 _sample_count )
{
@@ -895,7 +895,7 @@ bool FASTCALL ladspaManager::run( const ladspa_key_t & _plugin,
bool FASTCALL ladspaManager::runAdding( const ladspa_key_t & _plugin,
bool ladspaManager::runAdding( const ladspa_key_t & _plugin,
LADSPA_Handle _instance,
Uint32 _sample_count )
{
@@ -919,7 +919,7 @@ bool FASTCALL ladspaManager::runAdding( const ladspa_key_t & _plugin,
bool FASTCALL ladspaManager::setRunAddingGain( const ladspa_key_t & _plugin,
bool ladspaManager::setRunAddingGain( const ladspa_key_t & _plugin,
LADSPA_Handle _instance,
LADSPA_Data _gain )
{
@@ -944,7 +944,7 @@ bool FASTCALL ladspaManager::setRunAddingGain( const ladspa_key_t & _plugin,
bool FASTCALL ladspaManager::deactivate( const ladspa_key_t & _plugin,
bool ladspaManager::deactivate( const ladspa_key_t & _plugin,
LADSPA_Handle _instance )
{
if( m_ladspaManagerMap.contains( _plugin ) )
@@ -966,7 +966,7 @@ bool FASTCALL ladspaManager::deactivate( const ladspa_key_t & _plugin,
bool FASTCALL ladspaManager::cleanup( const ladspa_key_t & _plugin,
bool ladspaManager::cleanup( const ladspa_key_t & _plugin,
LADSPA_Handle _instance )
{
if( m_ladspaManagerMap.contains( _plugin ) )

10
src/core/main.cpp
View File

@@ -35,7 +35,7 @@
#include <QtGui/QPainter>
#include <QtGui/QSplashScreen>
#ifdef HAVE_SCHED_H
#ifdef LMMS_HAVE_SCHED_H
#include <sched.h>
#endif
@@ -72,7 +72,7 @@ inline void loadTranslation( const QString & _tname,
int main( int argc, char * * argv )
{
#ifdef HAVE_SCHED_H
#ifdef LMMS_HAVE_SCHED_H
struct sched_param sparam;
sparam.sched_priority = ( sched_get_priority_max( SCHED_FIFO ) +
sched_get_priority_min( SCHED_FIFO ) ) / 2;
@@ -118,7 +118,7 @@ int main( int argc, char * * argv )
"modify it under the terms of the GNU General Public\n"
"License as published by the Free Software Foundation; either\n"
"version 2 of the License, or (at your option) any later version.\n\n"
"Try \"%s --help\" for more information.\n\n", PACKAGE_VERSION,
"Try \"%s --help\" for more information.\n\n", LMMS_PACKAGE_VERSION,
argv[0] );
return( EXIT_SUCCESS );
}
@@ -151,7 +151,7 @@ int main( int argc, char * * argv )
" default: 2\n"
"-v, --version show version information and exit.\n"
"-h, --help show this usage message and exit.\n\n",
PACKAGE_VERSION );
LMMS_PACKAGE_VERSION );
return( EXIT_SUCCESS );
}
else if( argc > i && ( QString( argv[i] ) == "--render" ||
@@ -293,7 +293,7 @@ int main( int argc, char * * argv )
QString pos = QLocale::system().name().left( 2 );
// load translation for Qt-widgets/-dialogs
loadTranslation( QString( "qt_" ) + pos,
QString( QT_TRANSLATIONS_DIR ) );
QString( LMMS_QT_TRANSLATIONS_DIR ) );
// load actual translation for LMMS
loadTranslation( pos );

4
src/core/mmp.cpp
View File

@@ -68,7 +68,7 @@ multimediaProject::multimediaProject( ProjectTypes _project_type ) :
root.setAttribute( "version", MMP_VERSION_STRING );
root.setAttribute( "type", typeName( _project_type ) );
root.setAttribute( "creator", "Linux MultiMedia Studio (LMMS)" );
root.setAttribute( "creatorversion", VERSION );
root.setAttribute( "creatorversion", LMMS_VERSION );
appendChild( root );
m_head = createElement( "head" );
@@ -172,7 +172,7 @@ multimediaProject::multimediaProject( const QString & _in_file_name,
}
if( _upgrade && root.hasAttribute( "creatorversion" )
&& root.attribute( "creatorversion" ) != VERSION )
&& root.attribute( "creatorversion" ) != LMMS_VERSION )
{
upgrade();
}

2
src/core/plugin.cpp
View File

@@ -147,7 +147,7 @@ void plugin::waitForWorkerThread( void )
void plugin::getDescriptorsOfAvailPlugins( QVector<descriptor> & _plugin_descs )
{
QDir directory( configManager::inst()->pluginDir() );
#ifdef BUILD_WIN32
#ifdef LMMS_BUILD_WIN32
QFileInfoList list = directory.entryInfoList(
QStringList( "*.dll" ) );
#else

54
src/core/sample_buffer.cpp
View File

@@ -28,10 +28,6 @@
#include "sample_buffer.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <QtCore/QBuffer>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
@@ -42,23 +38,23 @@
#include <cstring>
#ifdef SDL_SDL_SOUND_H
#include SDL_SDL_SOUND_H
#ifdef LMMS_SDL_SDL_SOUND_H
#include LMMS_SDL_SDL_SOUND_H
#endif
#ifdef HAVE_SNDFILE_H
#ifdef LMMS_HAVE_SNDFILE_H
#include <sndfile.h>
#endif
#ifdef HAVE_VORBIS_VORBISFILE_H
#ifdef LMMS_HAVE_VORBIS_VORBISFILE_H
#include <vorbis/vorbisfile.h>
#endif
#ifdef HAVE_FLAC_STREAM_ENCODER_H
#ifdef LMMS_HAVE_FLAC_STREAM_ENCODER_H
#include <FLAC/stream_encoder.h>
#endif
#ifdef HAVE_FLAC_STREAM_DECODER_H
#ifdef LMMS_HAVE_FLAC_STREAM_DECODER_H
#include <FLAC/stream_decoder.h>
#endif
@@ -90,7 +86,7 @@ sampleBuffer::sampleBuffer( const QString & _audio_file,
m_frequency( BaseFreq ),
m_sampleRate( engine::getMixer()->baseSampleRate() )
{
#ifdef SDL_SDL_SOUND_H
#ifdef LMMS_SDL_SDL_SOUND_H
// init sound-file-system of SDL
Sound_Init();
#endif
@@ -125,7 +121,7 @@ sampleBuffer::sampleBuffer( const sampleFrame * _data, const f_cnt_t _frames ) :
memcpy( m_origData, _data, _frames * BYTES_PER_FRAME );
m_origFrames = _frames;
}
#ifdef SDL_SDL_SOUND_H
#ifdef LMMS_SDL_SDL_SOUND_H
// init sound-file-system of SDL
Sound_Init();
#endif
@@ -156,7 +152,7 @@ sampleBuffer::sampleBuffer( const f_cnt_t _frames ) :
memset( m_origData, 0, _frames * BYTES_PER_FRAME );
m_origFrames = _frames;
}
#ifdef SDL_SDL_SOUND_H
#ifdef LMMS_SDL_SDL_SOUND_H
// init sound-file-system of SDL
Sound_Init();
#endif
@@ -209,21 +205,21 @@ void sampleBuffer::update( bool _keep_settings )
m_frames = 0;
#ifdef HAVE_SNDFILE_H
#ifdef LMMS_HAVE_SNDFILE_H
if( m_frames == 0 )
{
m_frames = decodeSampleSF( f, buf, channels,
samplerate );
}
#endif
#ifdef HAVE_VORBIS_VORBISFILE_H
#ifdef LMMS_HAVE_VORBIS_VORBISFILE_H
if( m_frames == 0 )
{
m_frames = decodeSampleOGGVorbis( f, buf, channels,
samplerate );
}
#endif
#ifdef SDL_SDL_SOUND_H
#ifdef LMMS_SDL_SDL_SOUND_H
if( m_frames == 0 )
{
m_frames = decodeSampleSDL( f, buf, channels,
@@ -341,7 +337,7 @@ void sampleBuffer::normalizeSampleRate( const sample_rate_t _src_sr,
#ifdef SDL_SDL_SOUND_H
#ifdef LMMS_SDL_SDL_SOUND_H
f_cnt_t sampleBuffer::decodeSampleSDL( const char * _f,
int_sample_t * & _buf,
ch_cnt_t _channels,
@@ -376,7 +372,7 @@ f_cnt_t sampleBuffer::decodeSampleSDL( const char * _f,
#ifdef HAVE_SNDFILE_H
#ifdef LMMS_HAVE_SNDFILE_H
f_cnt_t sampleBuffer::decodeSampleSF( const char * _f,
int_sample_t * & _buf,
ch_cnt_t & _channels,
@@ -422,7 +418,7 @@ f_cnt_t sampleBuffer::decodeSampleSF( const char * _f,
#ifdef HAVE_VORBIS_VORBISFILE_H
#ifdef LMMS_HAVE_VORBIS_VORBISFILE_H
// callback-functions for reading ogg-file
@@ -576,7 +572,7 @@ f_cnt_t sampleBuffer::decodeSampleDS( const char * _f,
bool FASTCALL sampleBuffer::play( sampleFrame * _ab, handleState * _state,
bool sampleBuffer::play( sampleFrame * _ab, handleState * _state,
const fpp_t _frames,
const float _freq,
const bool _looped ) const
@@ -860,10 +856,10 @@ QString sampleBuffer::openAudioFile( void ) const
}
#undef HAVE_FLAC_STREAM_ENCODER_H /* not yet... */
#undef HAVE_FLAC_STREAM_DECODER_H
#undef LMMS_HAVE_FLAC_STREAM_ENCODER_H /* not yet... */
#undef LMMS_HAVE_FLAC_STREAM_DECODER_H
#ifdef HAVE_FLAC_STREAM_ENCODER_H
#ifdef LMMS_HAVE_FLAC_STREAM_ENCODER_H
FLAC__StreamEncoderWriteStatus flacStreamEncoderWriteCallback(
const FLAC__StreamEncoder *
/*_encoder*/,
@@ -900,7 +896,7 @@ void flacStreamEncoderMetadataCallback( const FLAC__StreamEncoder *,
QString & sampleBuffer::toBase64( QString & _dst ) const
{
#ifdef HAVE_FLAC_STREAM_ENCODER_H
#ifdef LMMS_HAVE_FLAC_STREAM_ENCODER_H
const f_cnt_t FRAMES_PER_BUF = 1152;
FLAC__StreamEncoder * flac_enc = FLAC__stream_encoder_new();
@@ -950,12 +946,12 @@ QString & sampleBuffer::toBase64( QString & _dst ) const
_dst );
#else /* HAVE_FLAC_STREAM_ENCODER_H */
#else /* LMMS_HAVE_FLAC_STREAM_ENCODER_H */
base64::encode( (const char *) m_data,
m_frames * sizeof( sampleFrame ), _dst );
#endif /* HAVE_FLAC_STREAM_ENCODER_H */
#endif /* LMMS_HAVE_FLAC_STREAM_ENCODER_H */
return( _dst );
}
@@ -1013,7 +1009,7 @@ void sampleBuffer::setAudioFile( const QString & _audio_file )
#ifdef HAVE_FLAC_STREAM_DECODER_H
#ifdef LMMS_HAVE_FLAC_STREAM_DECODER_H
struct flacStreamDecoderClientData
{
@@ -1112,7 +1108,7 @@ void sampleBuffer::loadFromBase64( const QString & _data )
int dsize = 0;
base64::decode( _data, &dst, &dsize );
#ifdef HAVE_FLAC_STREAM_DECODER_H
#ifdef LMMS_HAVE_FLAC_STREAM_DECODER_H
QByteArray orig_data = QByteArray::fromRawData( dst, dsize );
QBuffer ba_reader( &orig_data );
@@ -1152,7 +1148,7 @@ void sampleBuffer::loadFromBase64( const QString & _data )
m_origData = new sampleFrame[m_origFrames];
memcpy( m_origData, orig_data.data(), orig_data.size() );
#else /* HAVE_FLAC_STREAM_DECODER_H */
#else /* LMMS_HAVE_FLAC_STREAM_DECODER_H */
m_origFrames = dsize / sizeof( sampleFrame );
delete[] m_origData;

12
src/core/song.cpp
View File

@@ -25,22 +25,14 @@
*/
#include "song.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <math.h>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtGui/QFileDialog>
#include <QtGui/QMessageBox>
#include <math.h>
#include "song.h"
#include "automation_track.h"
#include "automation_editor.h"
#include "bb_editor.h"

8
src/gui/about_dialog.cpp
View File

@@ -32,11 +32,7 @@
#include <QtGui/QTextEdit>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "lmmsconfig.h"
#include "about_dialog.h"
#include "embed.h"
@@ -53,7 +49,7 @@ aboutDialog::aboutDialog() :
m_iconLbl->setGeometry( 10, 10, 64, 64 );
m_appNameLbl = new QLabel( tr( "Linux MultiMedia Studio %1"
).arg( VERSION ), this );
).arg( LMMS_VERSION ), this );
m_appNameLbl->setGeometry( 80, 30, 280, 20 );
m_aboutTabs = new QTabWidget( this );

12
src/gui/main_window.cpp
View File

@@ -25,9 +25,6 @@
*/
#include "main_window.h"
#include <Qt/QtXml>
#include <QtGui/QApplication>
#include <QtGui/QCloseEvent>
@@ -39,12 +36,7 @@
#include <QtGui/QMessageBox>
#include <QtGui/QSplitter>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "main_window.h"
#include "bb_editor.h"
#include "song_editor.h"
#include "song.h"
@@ -499,7 +491,7 @@ void mainWindow::resetWindowTitle( void )
{
title += '*';
}
setWindowTitle( title + " - " + tr( "LMMS %1" ).arg( VERSION ) );
setWindowTitle( title + " - " + tr( "LMMS %1" ).arg( LMMS_VERSION ) );
}

2
src/gui/piano_roll.cpp
View File

@@ -2746,7 +2746,7 @@ noteVector::const_iterator pianoRoll::noteIteratorUnderMouse( void )
#ifdef BUILD_LINUX
#ifdef LMMS_BUILD_LINUX
bool pianoRoll::x11Event( XEvent * _xe )
{
if( validPattern() )

16
src/gui/setup_dialog.cpp
View File

@@ -106,7 +106,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
m_artworkDir( configManager::inst()->artworkDir() ),
m_flDir( configManager::inst()->flDir() ),
m_ladDir( configManager::inst()->ladspaDir() ),
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
m_stkDir( configManager::inst()->stkDir() ),
#endif
m_disableChActInd( configManager::inst()->value( "ui",
@@ -133,7 +133,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
m_tabBar->setFixedWidth( 72 );
QWidget * ws = new QWidget( settings );
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
ws->setFixedSize( 360, 422 );
#else
ws->setFixedSize( 360, 366 );
@@ -260,7 +260,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
QWidget * directories = new QWidget( ws );
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
directories->setFixedSize( 360, 372 );
#else
directories->setFixedSize( 360, 326 );
@@ -364,7 +364,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
connect( laddir_select_btn, SIGNAL( clicked() ), this,
SLOT( openLADSPADir() ) );
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
// STK-dir
tabWidget * stk_tw = new tabWidget( tr(
"STK rawwave directory" ).toUpper(),
@@ -394,7 +394,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
dir_layout->addWidget( fl_tw );
dir_layout->addSpacing( 10 );
dir_layout->addWidget( lad_tw );
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
dir_layout->addSpacing( 10 );
dir_layout->addWidget( stk_tw );
#endif
@@ -708,7 +708,7 @@ void setupDialog::accept( void )
configManager::inst()->setArtworkDir( m_artworkDir );
configManager::inst()->setFLDir( m_flDir );
configManager::inst()->setLADSPADir( m_ladDir );
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
configManager::inst()->setSTKDir( m_stkDir );
#endif
@@ -982,7 +982,7 @@ void setupDialog::openLADSPADir( void )
void setupDialog::openSTKDir( void )
{
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
QString new_dir = QFileDialog::getExistingDirectory( this,
tr( "Choose STK rawwave directory" ),
m_ladDir );
@@ -1014,7 +1014,7 @@ void setupDialog::setLADSPADir( const QString & _fd )
void setupDialog::setSTKDir( const QString & _fd )
{
#ifdef HAVE_STK_H
#ifdef LMMS_HAVE_STK_H
m_stkDir = _fd;
#endif
}

12
src/gui/song_editor.cpp
View File

@@ -25,16 +25,6 @@
*/
#include "song_editor.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <math.h>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtGui/QAction>
@@ -48,7 +38,9 @@
#include <QtGui/QScrollBar>
#include <QtGui/QStatusBar>
#include <math.h>
#include "song_editor.h"
#include "automatable_slider.h"
#include "bb_editor.h"
#include "bb_track.h"

2
src/tracks/instrument_track.cpp
View File

@@ -506,7 +506,7 @@ QString instrumentTrack::displayName( void ) const
bool FASTCALL instrumentTrack::play( const midiTime & _start,
bool instrumentTrack::play( const midiTime & _start,
const fpp_t _frames,
const f_cnt_t _offset,
Sint16 _tco_num )