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

fixed compilation issues with GCC 4.3

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

29
ChangeLog
View File

@@ -1,3 +1,32 @@
2008-02-11 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* plugins/audio_file_processor/audio_file_processor.cpp:
* plugins/ladspa_base/ladspa_manager.cpp:
* plugins/ladspa_effect/ladspa_effect.cpp:
* plugins/patman/patman.cpp:
* plugins/vestige/vestige.cpp:
* plugins/vst_base/lvsl_client.h:
* include/track.h:
* include/dummy_plugin.h:
* include/config_mgr.h:
* include/instrument_track.h:
* include/file_browser.h:
* include/dummy_instrument.h:
* include/midi_time.h:
* include/basic_filters.h:
* include/journalling_object.h:
* include/types.h:
* include/dummy_effect.h:
* src/audio/audio_file_ogg.cpp:
* src/core/arp_and_chords_tab_widget.cpp:
* src/core/preset_preview_play_handle.cpp:
* src/core/export_project_dialog.cpp:
* src/core/main_window.cpp:
* src/lib/drumsynth.cpp:
* src/tracks/instrument_track.cpp:
* src/tracks/pattern.cpp:
fixed compilation issues with GCC 4.3
2008-01-05 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* src/widgets/rack_view.cpp:

2
include/basic_filters.h
View File

@@ -238,7 +238,7 @@ public:
}
inline void calcFilterCoeffs( float _freq, float _q
void calcFilterCoeffs( float _freq, float _q
/*, const bool _q_is_bandwidth = FALSE*/ )
{
// temp coef vars

4
include/config_mgr.h
View File

@@ -1,7 +1,7 @@
/*
* config_mgr.h - class configManager, a class for managing LMMS-configuration
*
* 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
*
@@ -73,7 +73,7 @@ class configManager : public QDialog
{
Q_OBJECT
public:
static inline configManager * inst( void )
static configManager * inst( void )
{
if( s_instanceOfMe == NULL )
{

12
include/dummy_effect.h
View File

@@ -55,30 +55,30 @@ public:
class dummyEffect : public effect
{
public:
inline dummyEffect( void ) :
dummyEffect( void ) :
effect( NULL, NULL )
{
}
inline virtual ~dummyEffect()
virtual ~dummyEffect()
{
}
inline virtual void saveSettings( QDomDocument &, QDomElement & )
virtual void FASTCALL saveSettings( QDomDocument &, QDomElement & )
{
}
inline virtual void loadSettings( const QDomElement & )
virtual void FASTCALL loadSettings( const QDomElement & )
{
}
inline virtual QString nodeName( void ) const
virtual QString nodeName( void ) const
{
return( "dummyeffect" );
}
inline virtual effectControlDialog * createControlDialog( track * )
virtual effectControlDialog * createControlDialog( track * )
{
return( new dummyEffectControlDialog( this ) );
}

12
include/dummy_instrument.h
View File

@@ -2,7 +2,7 @@
* dummy_instrument.h - instrument used as fallback if an instrument couldn't
* be loaded
*
* Copyright (c) 2005-2006 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
*
@@ -33,25 +33,25 @@
class dummyInstrument : public instrument
{
public:
inline dummyInstrument( instrumentTrack * _channel_track ) :
dummyInstrument( instrumentTrack * _channel_track ) :
instrument( _channel_track, NULL )
{
}
inline virtual ~dummyInstrument()
virtual ~dummyInstrument()
{
}
inline virtual void saveSettings( QDomDocument &, QDomElement & )
virtual void FASTCALL saveSettings( QDomDocument &, QDomElement & )
{
}
inline virtual void loadSettings( const QDomElement & )
virtual void FASTCALL loadSettings( const QDomElement & )
{
}
inline virtual QString nodeName( void ) const
virtual QString nodeName( void ) const
{
return( "dummyinstrument" );
}

12
include/dummy_plugin.h
View File

@@ -2,7 +2,7 @@
* dummy_plugin.h - empty plugin which is used as fallback if a plugin couldn't
* be found
*
* 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
*
@@ -33,25 +33,25 @@
class dummyPlugin : public plugin
{
public:
inline dummyPlugin( void ) :
dummyPlugin( void ) :
plugin( NULL )
{
}
inline virtual ~dummyPlugin()
virtual ~dummyPlugin()
{
}
inline virtual void saveSettings( QDomDocument &, QDomElement & )
virtual void FASTCALL saveSettings( QDomDocument &, QDomElement & )
{
}
inline virtual void loadSettings( const QDomElement & )
virtual void FASTCALL loadSettings( const QDomElement & )
{
}
inline virtual QString nodeName( void ) const
virtual QString nodeName( void ) const
{
return( "dummyplugin" );
}

4
include/file_browser.h
View File

@@ -1,7 +1,7 @@
/*
* file_browser.h - include file for fileBrowser
*
* 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
*
@@ -223,7 +223,7 @@ public:
const QString & _path );
#endif
inline QString fullName( void ) const
QString fullName( void ) const
{
return( QDir::cleanPath( m_path ) + QDir::separator() +
text( 0 ) );

6
include/instrument_track.h
View File

@@ -106,11 +106,7 @@ public:
void FASTCALL deleteNotePluginData( notePlayHandle * _n );
// name-stuff
inline const QString & name( void ) const
{
return( m_name );
}
void FASTCALL setName( const QString & _new_name );
virtual void setName( const QString & _new_name );
// volume & surround-position-stuff
void FASTCALL setVolume( volume _new_volume );

2
include/journalling_object.h
View File

@@ -115,7 +115,7 @@ public:
journallingObject( void );
virtual ~journallingObject();
inline const jo_id_t id( void ) const
inline jo_id_t id( void ) const
{
return( m_id );
}

6
include/midi_time.h
View File

@@ -2,7 +2,7 @@
* midi_time.h - declaration of class midiTime which provides data-type for
* position- and length-variables
*
* 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
*
@@ -39,7 +39,7 @@ public:
{
}
inline midiTime( const Sint32 _abs = 0 ) :
midiTime( const Sint32 _abs = 0 ) :
m_tact( _abs / 64 ),
m_tact64th( _abs % 64 )
{
@@ -50,7 +50,7 @@ public:
*this = _t;
}
inline midiTime toNearestTact( void ) const
midiTime toNearestTact( void ) const
{
if( m_tact64th >= 32 )
{

4
include/track.h
View File

@@ -2,7 +2,7 @@
* track.h - declaration of classes concerning tracks -> neccessary for all
* track-like objects (beat/bassline, sample-track...)
*
* 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
*
@@ -498,7 +498,7 @@ public:
{
return( m_name );
}
inline virtual void setName( const QString & _new_name )
virtual void setName( const QString & _new_name )
{
m_name = _new_name;
}

18
include/types.h
View File

@@ -1,7 +1,7 @@
/*
* types.h - typedefs for common types that are used in the whole app
*
* 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
*
@@ -26,6 +26,8 @@
#ifndef _TYPES_H
#define _TYPES_H
#include <limits>
typedef unsigned char Uint8;
typedef signed char Sint8;
typedef unsigned short Uint16;
@@ -60,13 +62,15 @@ typedef Uint32 jo_id_t; // (unique) ID of a journalling object
template<typename T>
struct valueRanges
{
enum
static inline T min( void )
{
max = static_cast<T>( static_cast<T>( ~0 ) > 0 ?
~0 : ( ( ( T ) 1 << ( sizeof( T ) * 8 - 1 ) ) - 1 ) ),
min = static_cast<T>( static_cast<T>( ~0 ) > 0 ?
0 : ( -max - 1 ) )
} ;
return( std::numeric_limits<T>::min() );
}
static inline T max( void )
{
return( std::numeric_limits<T>::max() );
}
} ;

4
plugins/audio_file_processor/audio_file_processor.cpp
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() == "" ) )
{

4
plugins/ladspa_base/ladspa_manager.cpp
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"

1
plugins/ladspa_effect/ladspa_effect.cpp
View File

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

2
plugins/patman/patman.cpp
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 == "" ) )
{

6
plugins/vestige/vestige.cpp
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();

8
plugins/vst_base/lvsl_client.h
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" );
}

2
src/audio/audio_file_ogg.cpp
View File

@@ -80,7 +80,7 @@ inline Sint32 audioFileOgg::writePage( void )
bool audioFileOgg::startEncoding( void )
{
vorbis_comment vc;
char * comments = "Cool=This song has been made using Linux "
char * comments = (char *) "Cool=This song has been made using Linux "
"MultiMedia Studio";
Sint32 comment_length = strlen( comments );

3
src/core/arp_and_chords_tab_widget.cpp
View File

@@ -4,7 +4,7 @@
* arp_and_chords_tab_widget.cpp - widget for use in arp/chord-tab of
* instrument-track-window
*
* 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
*
@@ -41,6 +41,7 @@
#endif
#include <cstdlib>
#include "arp_and_chords_tab_widget.h"
#include "combobox.h"

3
src/core/export_project_dialog.cpp
View File

@@ -3,7 +3,7 @@
/*
* export_project_dialog.cpp - implementation of dialog 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
*
@@ -48,6 +48,7 @@
#endif
#include <cstdlib>
#include "export_project_dialog.h"
#include "song_editor.h"

3
src/core/main_window.cpp
View File

@@ -3,7 +3,7 @@
/*
* main_window.cpp - implementation of LMMS-main-window
*
* 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
*
@@ -61,6 +61,7 @@
#include <config.h>
#endif
#include <cstdlib>
#include "main_window.h"
#include "bb_editor.h"

2
src/core/preset_preview_play_handle.cpp
View File

@@ -154,7 +154,7 @@ presetPreviewPlayHandle::presetPreviewPlayHandle(
// create note-play-handle for it
m_previewNote = new notePlayHandle(
s_previewTC->previewInstrumentTrack(), 0,
valueRanges<f_cnt_t>::max / 2,
valueRanges<f_cnt_t>::max() / 2,
note( 0, 0, static_cast<tones>( A ),
static_cast<octaves>( DEFAULT_OCTAVE - 1 ), 100 ) );

2
src/lib/drumsynth.cpp
View File

@@ -10,6 +10,8 @@
#include <fstream>
#include <string>
#include <limits>
#include <cstring>
#include <math.h> //sin(), exp(), etc.
#include <stdio.h> //sscanf(), sprintf()

19
src/tracks/instrument_track.cpp
View File

@@ -4,7 +4,7 @@
* instrument_track.cpp - implementation of instrument-track-class
* (window + data-structures)
*
* 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
*
@@ -63,6 +63,7 @@
#include "instrument_track.h"
#include "arp_and_chords_tab_widget.h"
#include "audio_port.h"
#include "automatable_object_templates.h"
#include "automation_pattern.h"
#include "config_mgr.h"
#include "debug.h"
@@ -631,7 +632,7 @@ void instrumentTrack::processInEvent( const midiEvent & _me,
notePlayHandle( this,
_time.frames(
engine::framesPerTact64th() ),
valueRanges<f_cnt_t>::max / 2,
valueRanges<f_cnt_t>::max() / 2,
n );
if( engine::getMixer()->addPlayHandle(
nph ) )
@@ -873,19 +874,19 @@ void instrumentTrack::setName( const QString & _new_name )
}
}
m_name = _new_name;
setWindowTitle( m_name );
track::setName( _new_name );
setWindowTitle( _new_name );
if( m_instrumentNameLE->text() != _new_name )
{
m_instrumentNameLE->setText( m_name );
m_instrumentNameLE->setText( _new_name );
}
#ifdef LMMS_DEBUG
assert( m_tswInstrumentTrackButton != NULL );
#endif
m_tswInstrumentTrackButton->setText( m_name );
m_midiPort->setName( m_name );
m_audioPort->setName( m_name );
m_tswInstrumentTrackButton->setText( _new_name );
m_midiPort->setName( _new_name );
m_audioPort->setName( _new_name );
}
@@ -1145,7 +1146,7 @@ trackContentObject * instrumentTrack::createTCO( const midiTime & )
void instrumentTrack::saveTrackSpecificSettings( QDomDocument & _doc,
QDomElement & _this )
{
_this.setAttribute( "name", name() );
_this.setAttribute( "name", track::name() );
m_volumeKnob->saveSettings( _doc, _this, "vol" );
m_surroundArea->saveSettings( _doc, _this, "surpos" );

6
src/tracks/pattern.cpp
View File

@@ -3,7 +3,7 @@
/*
* pattern.cpp - implementation of class pattern which holds notes
*
* Copyright (c) 2004-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2007 Danny McRae <khjklujn/at/yahoo.com>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
@@ -86,7 +86,7 @@ pattern::pattern ( instrumentTrack * _instrument_track ) :
m_needsUpdate( TRUE ),
m_instrumentTrack( _instrument_track ),
m_patternType( BEAT_PATTERN ),
m_name( _instrument_track->name() ),
m_name( _instrument_track->track::name() ),
m_steps( DEFAULT_STEPS_PER_TACT ),
m_frozenPattern( NULL ),
m_freezing( FALSE ),
@@ -499,7 +499,7 @@ void pattern::clear( void )
void pattern::resetName( void )
{
m_name = m_instrumentTrack->name();
m_name = m_instrumentTrack->track::name();
}