hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

made LMMS build for win32, coding-style fixes

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1038 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-06-01 22:35:02 +00:00
parent 8618b1474f
commit d3516cd5c5
48 changed files with 291 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/automatable_button.h
View File

@@ -34,7 +34,7 @@
class automatableButtonGroup;
class automatableButton : public QPushButton, public boolModelView
class EXPORT automatableButton : public QPushButton, public boolModelView
{
Q_OBJECT
public:
@@ -78,7 +78,7 @@ private:
class automatableButtonGroup : public QWidget, public intModelView
class EXPORT automatableButtonGroup : public QWidget, public intModelView
{
Q_OBJECT
public:

2
include/automatable_model.h
View File

@@ -67,7 +67,7 @@ class track;
class automatableModel : public model, public journallingObject
class EXPORT automatableModel : public model, public journallingObject
{
Q_OBJECT
public:

4
include/automatable_model_view.h
View File

@@ -34,7 +34,7 @@ class QMenu;
class automatableModelView : public modelView
class EXPORT automatableModelView : public modelView
{
public:
automatableModelView( ::model * _model ) :
@@ -94,7 +94,7 @@ protected:
#define generateTypedModelView(type) \
class type##ModelView : public automatableModelView \
class EXPORT type##ModelView : public automatableModelView \
{\
public:\
type##ModelView( ::model * _model ) :\

4
include/config_mgr.h
View File

@@ -35,6 +35,8 @@
#include <QtCore/QVector>
#include <QtCore/QPair>
#include "types.h"
class engine;
@@ -47,7 +49,7 @@ const QString TRACK_ICON_PATH = "track_icons/";
const QString LOCALE_PATH = "locale/";
class configManager
class EXPORT configManager
{
public:
static inline configManager * inst( void )

7
include/embed.h
View File

@@ -30,6 +30,9 @@
#include <QtCore/QString>
#include "types.h"
#define STRINGIFY_PLUGIN_NAME(s) STR(s)
#define STR(PN) #PN
@@ -45,8 +48,8 @@ struct descriptor
} ;
QPixmap getIconPixmap( const char * _name, int _w = -1, int _h = -1 );
QString getText( const char * _name );
QPixmap EXPORT getIconPixmap( const char * _name, int _w = -1, int _h = -1 );
QString EXPORT getText( const char * _name );
}

4
include/engine.h
View File

@@ -32,6 +32,8 @@
#include <QtCore/QMap>
#include "types.h"
class automationEditor;
class bbEditor;
class bbTrackContainer;
@@ -49,7 +51,7 @@ class ladspa2LMMS;
class controllerRackView;
class engine
class EXPORT engine
{
public:
static void init( const bool _has_gui = true );

2
include/instrument.h
View File

@@ -42,7 +42,7 @@ class notePlayHandle;
class track;
class instrument : public plugin
class EXPORT instrument : public plugin
{
public:
instrument( instrumentTrack * _instrument_track,

2
include/instrument_track.h
View File

@@ -61,7 +61,7 @@ class presetPreviewPlayHandle;
class volumeKnob;
class instrumentTrack : public track, public midiEventProcessor
class EXPORT instrumentTrack : public track, public midiEventProcessor
{
Q_OBJECT
mapPropertyFromModel(int,getVolume,setVolume,m_volumeModel);

2
include/instrument_view.h
View File

@@ -32,7 +32,7 @@
class instrumentTrackWindow;
class instrumentView : public pluginView
class EXPORT instrumentView : public pluginView
{
public:
instrumentView( instrument * _instrument, QWidget * _parent );

2
include/journalling_object.h
View File

@@ -98,7 +98,7 @@ private:
typedef QVector<journalEntry> journalEntryVector;
class journallingObject
class EXPORT journallingObject
{
public:
journallingObject( void );

2
include/knob.h
View File

@@ -47,7 +47,7 @@ enum knobTypes
class knob : public QWidget, public floatModelView
class EXPORT knob : public QWidget, public floatModelView
{
Q_OBJECT
Q_PROPERTY(float innerRadius READ innerRadius WRITE setInnerRadius)

2
include/mixer.h
View File

@@ -89,7 +89,7 @@ const Octaves BaseOctave = DefaultOctave;
class mixerWorkerThread;
class mixer : public QObject
class EXPORT mixer : public QObject
{
Q_OBJECT
public:

4
include/mmp.h
View File

@@ -31,7 +31,7 @@
#include "types.h"
class multimediaProject : public QDomDocument
class EXPORT multimediaProject : public QDomDocument
{
public:
enum ProjectTypes
@@ -87,7 +87,7 @@ private:
void upgrade( void );
struct typeDescStruct
struct EXPORT typeDescStruct
{
ProjectTypes m_type;
QString m_name;

8
include/mv_base.h
View File

@@ -28,10 +28,13 @@
#include <QtCore/QObject>
#include "types.h"
class modelView;
class model : public QObject
class EXPORT model : public QObject
{
Q_OBJECT
public:
@@ -69,9 +72,8 @@ signals:
class modelView
class EXPORT modelView
{
public:
modelView( model * _model );
virtual ~modelView()

2
include/note.h
View File

@@ -83,7 +83,7 @@ const float MaxDetuning = 4 * 12.0f;
class note : public journallingObject
class EXPORT note : public journallingObject
{
public:
note( const midiTime & _length = 0,

2
include/note_play_handle.h
View File

@@ -42,7 +42,7 @@ typedef QVector<notePlayHandle *> notePlayHandleVector;
typedef QVector<const notePlayHandle *> constNotePlayHandleVector;
class notePlayHandle : public playHandle, public note
class EXPORT notePlayHandle : public playHandle, public note
{
public:
void * m_pluginData;

2
include/oscillator.h
View File

@@ -41,7 +41,7 @@
#include "automatable_model.h"
class oscillator
class EXPORT oscillator
{
public:
enum WaveShapes

2
include/pixmap_button.h
View File

@@ -31,7 +31,7 @@
#include "automatable_button.h"
class pixmapButton : public automatableButton
class EXPORT pixmapButton : public automatableButton
{
Q_OBJECT
public:

16
include/plugin.h
View File

@@ -43,7 +43,7 @@ class pixmapLoader;
class pluginView;
class plugin : public journallingObject, public model
class EXPORT plugin : public journallingObject, public model
{
public:
enum PluginTypes
@@ -65,13 +65,13 @@ public:
struct descriptor
{
const char * name;
const char * public_name;
const char * publicName;
const char * description;
const char * author;
int version;
PluginTypes type;
const pixmapLoader * logo;
class subPluginFeatures
class EXPORT subPluginFeatures
{
public:
struct key
@@ -167,7 +167,7 @@ public:
virtual inline QString publicName( void ) const
{
return( m_publicName != QString::null ?
m_publicName : m_descriptor->public_name );
m_publicName : m_descriptor->publicName );
}
virtual void setPublicName( const QString & _public_name )
@@ -189,17 +189,17 @@ public:
// plugins can overload this for making other classes able to change
// settings of the plugin without knowing the actual class
virtual void FASTCALL setParameter( const QString & _param,
virtual void setParameter( const QString & _param,
const QString & _value );
// plugins can overload this for making other classes able to query
// settings of the plugin without knowing the actual class
virtual QString FASTCALL getParameter( const QString & _param );
virtual QString getParameter( const QString & _param );
// returns an instance of a plugin whose name matches to given one
// if specified plugin couldn't be loaded, it creates a dummy-plugin
static plugin * FASTCALL instantiate( const QString & _plugin_name,
static plugin * instantiate( const QString & _plugin_name,
model * _parent,
void * _data );
@@ -217,7 +217,7 @@ public:
virtual void waitForWorkerThread( void );
// fills given vector with descriptors of all available plugins
static void FASTCALL getDescriptorsOfAvailPlugins(
static void getDescriptorsOfAvailPlugins(
QVector<descriptor> & _plugin_descs );
// create a view for the model

2
include/plugin_view.h
View File

@@ -31,7 +31,7 @@
#include "plugin.h"
class pluginView : public QWidget, public modelView
class EXPORT pluginView : public QWidget, public modelView
{
public:
pluginView( plugin * _plugin, QWidget * _parent ) :

4
include/sample_buffer.h
View File

@@ -49,11 +49,11 @@
class QPainter;
class sampleBuffer : public QObject, public sharedObject
class EXPORT sampleBuffer : public QObject, public sharedObject
{
Q_OBJECT
public:
class handleState
class EXPORT handleState
{
public:
handleState( bool _varying_pitch = FALSE );

2
include/song.h
View File

@@ -46,7 +46,7 @@ const bpm_t MaxTempo = 999;
const tick MaxSongLength = 9999 * DefaultTicksPerTact;
class song : public trackContainer
class EXPORT song : public trackContainer
{
Q_OBJECT
mapPropertyFromModel(int,getTempo,setTempo,m_tempoModel);

3
include/string_pair_drag.h
View File

@@ -30,11 +30,12 @@
#include <QtGui/QDragEnterEvent>
#include <QtGui/QDropEvent>
#include "types.h"
class QPixmap;
class stringPairDrag : public QDrag
class EXPORT stringPairDrag : public QDrag
{
public:
stringPairDrag( const QString & _key, const QString & _value,

10
include/tooltip.h
View File

@@ -1,7 +1,7 @@
/*
* tooltip.h - namespace toolTip, a tooltip-wrapper for LMMS
*
* Copyright (c) 2005 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
*
@@ -28,14 +28,14 @@
#include <qstring.h>
#include "types.h"
class QWidget;
namespace toolTip
struct toolTip
{
void add( QWidget * _w, const QString & _txt );
static void EXPORT add( QWidget * _w, const QString & _txt );
} ;

2
include/track.h
View File

@@ -338,7 +338,7 @@ private:
// base-class for all tracks
class track : public model, public journallingObject
class EXPORT track : public model, public journallingObject
{
Q_OBJECT
mapPropertyFromModel(bool,muted,setMuted,m_mutedModel);

21
include/types.h
View File

@@ -74,4 +74,25 @@ struct valueRanges
} ;
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef BUILD_WIN32
#ifdef PLUGIN_NAME
#define EXPORT __declspec(dllimport)
#define PLUGIN_EXPORT __declspec(dllexport)
#else
#define EXPORT __declspec(dllexport)
#endif
#else
#define EXPORT
#define PLUGIN_EXPORT
#endif
#endif

4
include/volume_knob.h
View File

@@ -2,7 +2,7 @@
* volume_knob.h - defines a knob that display it's value as either a
* percentage or in dBV.
*
* Copyright (c) 2006-2007 Danny McRae <khjklujn/at/users.sourceforge.net>
* Copyright (c) 2006-2008 Danny McRae <khjklujn/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -30,7 +30,7 @@
#include "knob.h"
class volumeKnob : public knob
class EXPORT volumeKnob : public knob
{
Q_OBJECT
public: