hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 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

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];