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

src/audio/audio_file_ogg.cpp

@@ -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 );
 

src/core/arp_and_chords_tab_widget.cpp

@@ -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"

src/core/export_project_dialog.cpp

@@ -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"

src/core/main_window.cpp

@@ -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"

src/core/preset_preview_play_handle.cpp

@@ -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 ) );
 

src/lib/drumsynth.cpp

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

src/tracks/instrument_track.cpp

@@ -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" );

src/tracks/pattern.cpp

@@ -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();
 }