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

coding-style improvements

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms-mv@698 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-02-19 18:15:23 +00:00
parent 601e5c1df9
commit 3e29f447a9
13 changed files with 58 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ChangeLog
View File

@@ -1,3 +1,25 @@
2008-02-18 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* plugins/ladspa_effect/ladspa_subplugin_features.h:
* plugins/ladspa_effect/ladspa_subplugin_features.cpp:
* plugins/vst_effect/vst_control_dialog.h:
* plugins/audio_file_processor/audio_file_processor.cpp:
* plugins/audio_file_processor/audio_file_processor.h:
* include/plugin.h:
* include/audio_file_device.h:
* include/export.h:
* include/export_project_dialog.h:
* src/core/song.cpp:
* src/core/export_project_dialog.cpp:
coding-style improvements
* src/core/main_window.cpp:
made song-export work again
* plugins/patman/patman.cpp:
* plugins/patman/patman.h:
M/V-split of Patman-instrument
2008-02-18 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* plugins/flp_import/flp_import.h:

4
configure.in
View File

@@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
AC_INIT(lmms, 0.4.0-svn20080215-mv, lmms-devel/at/lists/dot/sf/dot/net)
AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20080215-mv)
AC_INIT(lmms, 0.4.0-svn20080219-mv, lmms-devel/at/lists/dot/sf/dot/net)
AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20080219-mv)
AM_CONFIG_HEADER(config.h)

2
include/audio_file_device.h
View File

@@ -48,7 +48,7 @@ public:
protected:
Sint32 FASTCALL writeData( const void * _data, Sint32 _len );
Sint32 writeData( const void * _data, Sint32 _len );
void seekToBegin( void );
inline bool useVBR( void ) const

12
include/export.h
View File

@@ -1,7 +1,7 @@
/*
* export.h - header which is needed 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
*
@@ -43,18 +43,18 @@ typedef audioFileDevice * ( * getDeviceInst)( const sample_rate_t _sample_rate,
mixer * _mixer );
enum fileTypes
enum ExportFileTypes
{
WAVE_FILE,
OGG_FILE,
NULL_FILE = 0xFF
WaveFile,
OggFile,
NullFile = 0xFF
} ;
struct fileEncodeDevice
{
fileTypes m_fileType;
ExportFileTypes m_fileType;
const char * m_description;
const char * m_extension;
getDeviceInst m_getDevInst;

6
include/export_project_dialog.h
View File

@@ -2,7 +2,7 @@
* export_project_dialog.h - declaration of class exportProjectDialog which is
* responsible for exporting project
*
* 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
*
@@ -69,7 +69,7 @@ private:
void finishProjectExport( void );
void abortProjectExport( void );
static fileTypes getFileTypeFromExtension( const QString & _ext );
static ExportFileTypes getFileTypeFromExtension( const QString & _ext );
static Sint16 s_availableBitrates[];
@@ -89,7 +89,7 @@ private:
QProgressBar * m_exportProgressBar;
QString m_fileName;
fileTypes m_fileType;
ExportFileTypes m_fileType;
bool m_deleteFile;
} ;

10
include/plugin.h
View File

@@ -49,7 +49,7 @@ class pluginView;
class plugin : public journallingObject, public model
{
public:
enum pluginTypes
enum PluginTypes
{
Instrument, // instrument being used in channel-track
Effect, // effect-plugin for effect-board
@@ -72,7 +72,7 @@ public:
const char * description;
const char * author;
int version;
pluginTypes type;
PluginTypes type;
const QPixmap * logo;
class subPluginFeatures
{
@@ -120,7 +120,7 @@ public:
};
typedef QList<key> keyList;
subPluginFeatures( plugin::pluginTypes _type ) :
subPluginFeatures( plugin::PluginTypes _type ) :
m_type( _type )
{
}
@@ -146,7 +146,7 @@ public:
protected:
const plugin::pluginTypes m_type;
const plugin::PluginTypes m_type;
}
* sub_plugin_features;
@@ -163,7 +163,7 @@ public:
}
// return plugin-type
inline pluginTypes type( void ) const
inline PluginTypes type( void ) const
{
return( m_descriptor->type );
}

2
plugins/audio_file_processor/audio_file_processor.cpp
View File

@@ -311,7 +311,7 @@ void audioFileProcessor::endPointModelChanged( void )
audioFileProcessor::subPluginFeatures::subPluginFeatures(
plugin::pluginTypes _type ) :
plugin::PluginTypes _type ) :
plugin::descriptor::subPluginFeatures( _type )
{
}

2
plugins/audio_file_processor/audio_file_processor.h
View File

@@ -44,7 +44,7 @@ public:
class subPluginFeatures : public plugin::descriptor::subPluginFeatures
{
public:
subPluginFeatures( plugin::pluginTypes _type );
subPluginFeatures( plugin::PluginTypes _type );
virtual const QStringList & supportedExtensions( void );

2
plugins/ladspa_effect/ladspa_subplugin_features.cpp
View File

@@ -40,7 +40,7 @@
#include "mixer.h"
ladspaSubPluginFeatures::ladspaSubPluginFeatures( plugin::pluginTypes _type ) :
ladspaSubPluginFeatures::ladspaSubPluginFeatures( plugin::PluginTypes _type ) :
subPluginFeatures( _type )
{
}

2
plugins/ladspa_effect/ladspa_subplugin_features.h
View File

@@ -36,7 +36,7 @@
class ladspaSubPluginFeatures : public plugin::descriptor::subPluginFeatures
{
public:
ladspaSubPluginFeatures( plugin::pluginTypes _type );
ladspaSubPluginFeatures( plugin::PluginTypes _type );
virtual void fillDescriptionWidget( QWidget * _parent,
const key * _key );

6
plugins/vst_effect/vst_control_dialog.h
View File

@@ -37,13 +37,13 @@ public:
vstControlDialog( QWidget * _parent, vstEffect * _eff );
virtual ~vstControlDialog();
virtual void FASTCALL saveSettings( QDomDocument & _doc,
/* virtual void saveSettings( QDomDocument & _doc,
QDomElement & _parent );
virtual void FASTCALL loadSettings( const QDomElement & _this );
virtual void loadSettings( const QDomElement & _this );
inline virtual QString nodeName( void ) const
{
return( "vstcontrols" );
}
}*/
virtual ch_cnt_t getControlCount( void )
{

21
src/core/export_project_dialog.cpp
View File

@@ -52,18 +52,18 @@ extern QString file_to_render;
fileEncodeDevice fileEncodeDevices[] =
{
{ WAVE_FILE, QT_TRANSLATE_NOOP( "exportProjectDialog",
{ WaveFile, QT_TRANSLATE_NOOP( "exportProjectDialog",
"Uncompressed Wave-File (*.wav)" ),
".wav", &audioFileWave::getInst },
#ifdef HAVE_VORBIS_CODEC_H
{ OGG_FILE, QT_TRANSLATE_NOOP( "exportProjectDialog",
{ OggFile, QT_TRANSLATE_NOOP( "exportProjectDialog",
"Compressed OGG-File (*.ogg)" ),
".ogg", &audioFileOgg::getInst },
#endif
// ... insert your own file-encoder-infos here... may be one day the
// user can add own encoders inside the program...
{ NULL_FILE, NULL, NULL, NULL }
{ NullFile, NULL, NULL, NULL }
} ;
@@ -136,7 +136,7 @@ exportProjectDialog::exportProjectDialog( const QString & _file_name,
TYPE_HEIGHT );
Uint8 idx = 0;
while( fileEncodeDevices[idx].m_fileType != NULL_FILE )
while( fileEncodeDevices[idx].m_fileType != NullFile )
{
m_typeModel->addItem(
tr( fileEncodeDevices[idx].m_description ) );
@@ -221,10 +221,11 @@ exportProjectDialog::~exportProjectDialog()
// little help-function for getting file-type from a file-extension (only for
// registered file-encoders)
fileTypes exportProjectDialog::getFileTypeFromExtension( const QString & _ext )
ExportFileTypes exportProjectDialog::getFileTypeFromExtension(
const QString & _ext )
{
int idx = 0;
while( fileEncodeDevices[idx].m_fileType != NULL_FILE )
while( fileEncodeDevices[idx].m_fileType != NullFile )
{
if( QString( fileEncodeDevices[idx].m_extension ) == _ext )
{
@@ -233,7 +234,7 @@ fileTypes exportProjectDialog::getFileTypeFromExtension( const QString & _ext )
++idx;
}
return( WAVE_FILE ); // default
return( WaveFile ); // default
}
@@ -276,7 +277,7 @@ void exportProjectDialog::closeEvent( QCloseEvent * _ce )
void exportProjectDialog::changedType( const QString & _new_type )
{
int idx = 0;
while( fileEncodeDevices[idx].m_fileType != NULL_FILE )
while( fileEncodeDevices[idx].m_fileType != NullFile )
{
if( tr( fileEncodeDevices[idx].m_description ) == _new_type )
{
@@ -293,7 +294,7 @@ void exportProjectDialog::changedType( const QString & _new_type )
void exportProjectDialog::exportBtnClicked( void )
{
int idx = 0;
while( fileEncodeDevices[idx].m_fileType != NULL_FILE )
while( fileEncodeDevices[idx].m_fileType != NullFile )
{
if( fileEncodeDevices[idx].m_fileType == m_fileType )
{
@@ -302,7 +303,7 @@ void exportProjectDialog::exportBtnClicked( void )
++idx;
}
if( fileEncodeDevices[idx].m_fileType == NULL_FILE )
if( fileEncodeDevices[idx].m_fileType == NullFile )
{
return;
}

2
src/core/song.cpp
View File

@@ -954,7 +954,7 @@ void song::exportProject( void )
int idx = 0;
QStringList types;
while( fileEncodeDevices[idx].m_fileType != NULL_FILE )
while( fileEncodeDevices[idx].m_fileType != NullFile )
{
types << tr( fileEncodeDevices[idx].m_description );
++idx;