fixed compilation issues with GCC 4.3

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms/stable-0.3@690 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-02-11 15:12:42 +00:00
parent f2d1d74cbf
commit f94bb2cb66
26 changed files with 106 additions and 70 deletions

View File

@@ -1,7 +1,7 @@
/*
* audio_file_processor.cpp - instrument for using audio-files
*
* 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
*
@@ -370,7 +370,7 @@ void audioFileProcessor::setAudioFile( const QString & _audio_file, bool _rename
{
// is current channel-name equal to previous-filename??
if( _rename &&
( getInstrumentTrack()->name() ==
( getInstrumentTrack()->track::name() ==
QFileInfo( m_sampleBuffer.audioFile() ).fileName() ||
m_sampleBuffer.audioFile() == "" ) )
{

View File

@@ -2,7 +2,7 @@
* ladspa_manager.cpp - a class to manage loading and instantiation
* of ladspa plugins
*
* Copyright (c) 2005-2007 Danny McRae <khjklujn@netscape.net>
* Copyright (c) 2005-2008 Danny McRae <khjklujn@netscape.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -42,7 +42,7 @@
#endif
#include <cstdlib>
#include <math.h>
#include "config_mgr.h"

View File

@@ -36,6 +36,7 @@
#endif
#include <malloc.h>
#include "ladspa_effect.h"
#include "mixer.h"

View File

@@ -417,7 +417,7 @@ void patmanSynth::setFile( const QString & _patch_file, bool _rename )
{
// is current channel-name equal to previous-filename??
if( _rename &&
( getInstrumentTrack()->name() ==
( getInstrumentTrack()->track::name() ==
QFileInfo( m_patchFile ).fileName() ||
m_patchFile == "" ) )
{

View File

@@ -1,7 +1,7 @@
/*
* vestige.cpp - instrument-plugin for hosting VST-plugins
*
* 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
*
@@ -220,8 +220,8 @@ void vestigeInstrument::setParameter( const QString & _param,
{
m_pluginMutex.lock();
const bool set_ch_name = ( m_plugin != NULL &&
getInstrumentTrack()->name() == m_plugin->name() ) ||
getInstrumentTrack()->name() ==
getInstrumentTrack()->track::name() == m_plugin->name() ) ||
getInstrumentTrack()->track::name() ==
instrumentTrack::tr( "Default" );
m_pluginMutex.unlock();

View File

@@ -1,7 +1,7 @@
/*
* lvsl_client.h - client for LVSL Server
*
* 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
*
@@ -116,10 +116,10 @@ public:
return( m_failed );
}
virtual void loadSettings( const QDomElement & _this );
virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
virtual void FASTCALL loadSettings( const QDomElement & _this );
virtual void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _this );
inline virtual QString nodeName( void ) const
virtual QString nodeName( void ) const
{
return( "vstplugin" );
}