reduced dependencies from automatable_model_templates.h and fixed according compiler-warnings

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@767 0778d3d1-df1d-0410-868b-ea421aaaa00d

ChangeLog

@@ -1,3 +1,53 @@
+2008-03-04	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* src/widgets/graph.cpp:
+	fixed compiler-warnings
+
+	* include/automatable_model.h:
+	* include/graph.h:
+	* include/surround_area.h:
+	* src/audio/audio_file_device.cpp:
+	* src/audio/audio_alsa.cpp:
+	* src/audio/audio_oss.cpp:
+	* src/audio/audio_port.cpp:
+	* src/audio/audio_jack.cpp:
+	* src/midi/midi_alsa_seq.cpp:
+	* src/lib/project_journal.cpp:
+	* src/lib/mmp.cpp:
+	* src/lib/oscillator.cpp:
+	* src/widgets/ladspa_control_view.cpp:
+	* src/widgets/envelope_and_lfo_view.cpp:
+	* src/widgets/instrument_midi_io_view.cpp:
+	* src/widgets/lcd_spinbox.cpp:
+	* src/widgets/group_box.cpp:
+	* src/widgets/volume_knob.cpp:
+	* src/tracks/automation_track.cpp:
+	* src/tracks/bb_track.cpp:
+	* src/tracks/instrument_track.cpp:
+	* src/core/preset_preview_play_handle.cpp:
+	* src/core/track_container.cpp:
+	* src/core/effect_control_dialog.cpp:
+	* src/core/import_filter.cpp:
+	* src/core/setup_dialog.cpp:
+	* src/core/sample_play_handle.cpp:
+	* src/core/envelope_and_lfo_parameters.cpp:
+	* src/core/main.cpp:
+	* src/core/mixer.cpp:
+	* src/core/effect.cpp:
+	* src/core/instrument_midi_io.cpp:
+	* src/core/track.cpp:
+	* src/core/timeline.cpp:
+	* src/core/instrument.cpp:
+	* src/core/surround_area.cpp:
+	* src/core/effect_select_dialog.cpp:
+	* src/core/automation_editor.cpp:
+	* src/core/meter_dialog.cpp:
+	reduced dependencies from automatable_model_templates.h and fixed
+	according compiler-warnings
+
+	* include/shared_object.h:
+	added mutex to protect reference-counter
+
 2008-03-03	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* src/core/piano_roll.cpp:
@@ -2755,7 +2805,7 @@
 	* include/pattern.h:
 	* include/sample_buffer.h:
 	* include/shared_object.h:
-	* plugins/ladspa_bas:e/ladspa_control.cpp:
+	* plugins/ladspa_base/ladspa_control.cpp:
 	* plugins/ladspa_base/ladspa_control.h:
 	* plugins/ladspa_effect/ladspa_effect.cpp:
 	* src/audio/audio_jack.cpp:

include/automatable_model.h

@@ -127,7 +127,7 @@ public:
 		return( m_curLevel );
 	}
 
-	inline T fittedValue( T _value ) const;
+	T fittedValue( T _value ) const;
 
 	inline T value( int _level ) const
 	{
@@ -215,11 +215,11 @@ private:
 
 	inline void unlinkModel( autoModel * _model );
 
-	inline static T attributeValue( QString _value );
+	static T attributeValue( QString _value );
 
 	inline void syncAutomationPattern( void );
 
-	inline void setLevel( int _level );
+	void setLevel( int _level );
 
 	inline int level( T _value ) const
 	{

include/graph.h

@@ -140,8 +140,8 @@ signals:
 private:
 
 	QVector<float> m_samples;
-	float m_maxValue;
 	float m_minValue;
+	float m_maxValue;
 
 	friend class graph;
 

include/surround_area.h

@@ -3,7 +3,7 @@
  *                   position of a channel + calculation of volume for each
  *                   speaker
  *
- * 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
  *
@@ -70,15 +70,8 @@ public:
 		m_posY.addJournalEntryFromOldToCurVal();
 	}
 
-	automationPattern * automationPatternX( void )
-	{
-		return( m_posX.getAutomationPattern() );
-	}
-
-	automationPattern * automationPatternY( void )
-	{
-		return( m_posY.getAutomationPattern() );
-	}
+	automationPattern * automationPatternX( void );
+	automationPattern * automationPatternY( void );
 
 
 private:

src/audio/audio_alsa.cpp

@@ -36,7 +36,6 @@
 #ifdef ALSA_SUPPORT
 
 #include "endian_handling.h"
-#include "automatable_model_templates.h"
 #include "config_mgr.h"
 #include "lcd_spinbox.h"
 #include "gui_templates.h"

src/audio/audio_file_device.cpp

@@ -30,7 +30,6 @@
 
 #include "audio_file_device.h"
 #include "export_project_dialog.h"
-#include "automatable_model_templates.h"
 
 
 audioFileDevice::audioFileDevice( const sample_rate_t _sample_rate,

src/audio/audio_jack.cpp

@@ -40,7 +40,6 @@
 
 #include "debug.h"
 #include "templates.h"
-#include "automatable_model_templates.h"
 #include "gui_templates.h"
 #include "config_mgr.h"
 #include "lcd_spinbox.h"

src/audio/audio_oss.cpp

@@ -35,7 +35,6 @@
 #include <QtGui/QLineEdit>
 
 #include "endian_handling.h"
-#include "automatable_model_templates.h"
 #include "lcd_spinbox.h"
 #include "gui_templates.h"
 #include "templates.h"

src/audio/audio_port.cpp

@@ -31,7 +31,6 @@
 #include "audio_port.h"
 #include "audio_device.h"
 #include "engine.h"
-#include "automatable_model_templates.h"
 
 
 audioPort::audioPort( const QString & _name, track * _track ) :

src/core/automation_editor.cpp

@@ -49,7 +49,6 @@
 
 
 #include "song_editor.h"
-#include "automatable_model_templates.h"
 #include "main_window.h"
 #include "embed.h"
 #include "engine.h"

src/core/effect.cpp

@@ -31,7 +31,6 @@
 #include "dummy_effect.h"
 #include "effect_chain.h"
 #include "effect_view.h"
-#include "automatable_model_templates.h"
 
 
 effect::effect( const plugin::descriptor * _desc,

src/core/effect_control_dialog.cpp

@@ -32,7 +32,6 @@
 #include "effect_control_dialog.h"
 #include "effect_controls.h"
 #include "effect.h"
-#include "automatable_model_templates.h"
 
 
 effectControlDialog::effectControlDialog( effectControls * _controls ) :

src/core/effect_select_dialog.cpp

@@ -33,7 +33,6 @@
 #include "effect_select_dialog.h"
 
 #include "gui_templates.h"
-#include "automatable_model_templates.h"
 #include "embed.h"
 
 

src/core/envelope_and_lfo_parameters.cpp

@@ -34,7 +34,6 @@
 #include "engine.h"
 #include "mmp.h"
 #include "oscillator.h"
-#include "automatable_model_templates.h"
 
 
 

src/core/import_filter.cpp

@@ -31,7 +31,6 @@
 #include "engine.h"
 #include "track_container.h"
 #include "project_journal.h"
-#include "automatable_model_templates.h"
 
 
 

src/core/instrument.cpp

@@ -27,7 +27,6 @@
 
 #include "instrument.h"
 #include "instrument_view.h"
-#include "automatable_model_templates.h"
 #include "instrument_track.h"
 #include "dummy_instrument.h"
 #include "note_play_handle.h"

src/core/instrument_midi_io.cpp

@@ -34,7 +34,6 @@
 #include "midi_client.h"
 #include "midi_port.h"
 #include "song.h"
-#include "automatable_model_templates.h"
 
 
 

src/core/main.cpp

@@ -44,7 +44,6 @@
 #include "export_project_dialog.h"
 #include "song.h"
 #include "gui_templates.h"
-#include "automatable_model_templates.h"
 #include "lmms_style.h"
 
 #warning TODO: move somewhere else

src/core/meter_dialog.cpp

@@ -3,7 +3,7 @@
 /*
  * meter_dialog.cpp - dialog for entering meter settings
  *
- * Copyright (c) 2006-2007 Danny McRae <khjklujn/at/yahoo.com>
+ * Copyright (c) 2006-2008 Danny McRae <khjklujn/at/yahoo.com>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -31,7 +31,6 @@
 #include "meter_dialog.h"
 #include "embed.h"
 #include "gui_templates.h"
-#include "automatable_model_templates.h"
 
 
 meterModel::meterModel( ::model * _parent, track * _track ) :

src/core/mixer.cpp

@@ -44,7 +44,6 @@
 #include "sample_play_handle.h"
 #include "piano_roll.h"
 #include "micro_timer.h"
-#include "automatable_model_templates.h"
 
 #include "audio_device.h"
 #include "midi_client.h"

src/core/preset_preview_play_handle.cpp

@@ -4,7 +4,7 @@
  * preset_preview_play_handle.cpp - implementation of class
  *                                  presetPreviewPlayHandle
  *
- * 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
  *
@@ -30,7 +30,6 @@
 #include <QtCore/QMutexLocker>
 
 #include "preset_preview_play_handle.h"
-#include "automatable_model_templates.h"
 #include "debug.h"
 #include "engine.h"
 #include "instrument_track.h"

src/core/sample_play_handle.cpp

@@ -26,7 +26,6 @@
 
 
 #include "sample_play_handle.h"
-#include "automatable_model_templates.h"
 #include "audio_port.h"
 #include "bb_track.h"
 #include "engine.h"

src/core/setup_dialog.cpp

@@ -49,7 +49,6 @@
 #include "tooltip.h"
 #include "led_checkbox.h"
 #include "lcd_spinbox.h"
-#include "automatable_model_templates.h"
 
 
 // platform-specific audio-interface-classes

src/core/surround_area.cpp

@@ -32,6 +32,7 @@
 #include <QtGui/QApplication>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QPainter>
+#include <Qt/QtXml>
 
 
 #include "automatable_model_templates.h"
@@ -271,6 +272,16 @@ void surroundAreaModel::loadSettings( const QDomElement & _this,
 
 
 
+automationPattern * surroundAreaModel::automationPatternX( void )
+{
+	return( m_posX.getAutomationPattern() );
+}
+
+automationPattern * surroundAreaModel::automationPatternY( void )
+{
+	return( m_posY.getAutomationPattern() );
+}
+
 
 
 

src/core/timeline.cpp

@@ -40,7 +40,6 @@
 #include "nstate_button.h"
 #include "main_window.h"
 #include "text_float.h"
-#include "automatable_model_templates.h"
 
 
 

src/core/track.cpp

@@ -39,6 +39,7 @@
 
 #include "automation_pattern.h"
 #include "automation_track.h"
+#include "automatable_model_templates.h"
 #include "bb_editor.h"
 #include "bb_track.h"
 #include "clipboard.h"

src/core/track_container.cpp

@@ -36,7 +36,6 @@
 #include <QtGui/QWheelEvent>
 
 
-#include "automatable_model_templates.h"
 #include "bb_track.h"
 #include "config_mgr.h"
 #include "debug.h"

src/lib/mmp.cpp

@@ -36,7 +36,6 @@
 #include "config_mgr.h"
 #include "project_version.h"
 #include "song_editor.h"
-#include "automatable_model_templates.h"
 
 
 multimediaProject::typeDescStruct

src/lib/oscillator.cpp

@@ -3,7 +3,7 @@
 /*
  * oscillator.cpp - implementation of powerful oscillator-class
  *
- * 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
  *
@@ -26,7 +26,6 @@
 
 
 #include "oscillator.h"
-#include "automatable_model_templates.h"
 
 
 

src/lib/project_journal.cpp

@@ -31,7 +31,6 @@
 #include "engine.h"
 #include "journalling_object.h"
 #include "song.h"
-#include "automatable_model_templates.h"
 
 
 projectJournal::projectJournal( void ) :

src/midi/midi_alsa_seq.cpp

@@ -36,7 +36,6 @@
 #include "song.h"
 #include "midi_port.h"
 #include "note.h"
-#include "automatable_model_templates.h"
 
 
 #ifdef ALSA_SUPPORT

src/tracks/automation_track.cpp

@@ -27,7 +27,6 @@
 
 
 #include "automation_track.h"
-#include "automatable_model_templates.h"
 
 
 

src/tracks/bb_track.cpp

@@ -585,7 +585,7 @@ bbTrackView::~bbTrackView()
 bool bbTrackView::close( void )
 {
 	engine::getBBEditor()->removeBBView( bbTrack::s_infoMap[m_bbTrack] );
-	trackView::close();
+	return( trackView::close() );
 }
 
 

src/tracks/instrument_track.cpp

@@ -44,7 +44,6 @@
 
 
 #include "audio_port.h"
-#include "automatable_model_templates.h"
 #include "automation_pattern.h"
 #include "config_mgr.h"
 #include "debug.h"

src/widgets/envelope_and_lfo_view.cpp

@@ -47,7 +47,6 @@
 #include "text_float.h"
 #include "tooltip.h"
 #include "track.h"
-#include "automatable_model_templates.h"
 
 
 

src/widgets/graph.cpp

@@ -308,9 +308,9 @@ graphModel::graphModel( float _min, float _max, Uint32 _length,
 		::model * _parent, track * _track,
 		bool _default_constructed ) :
 	model( _parent, _default_constructed ),
+	m_samples( _length ),
 	m_minValue( _min ),
-	m_maxValue( _max ),
-	m_samples( _length )
+	m_maxValue( _max )
 {
 }
 
@@ -332,7 +332,7 @@ void graphModel::setRange( float _min, float _max )
 		if( !m_samples.isEmpty() )
 		{
 			// Trim existing values 
-			for( int i=0; i < length(); i++ )
+			for( Uint32 i=0; i < length(); i++ )
 			{
 				m_samples[i] = fmaxf( _min, fminf( m_samples[i], _max ) );
 			}

src/widgets/group_box.cpp

@@ -42,7 +42,6 @@
 
 #include "embed.h"
 #include "gui_templates.h"
-#include "automatable_model_templates.h"
 
 
 QPixmap * groupBox::s_ledBg = NULL;

src/widgets/instrument_midi_io_view.cpp

@@ -41,7 +41,6 @@
 #include "lcd_spinbox.h"
 #include "tab_widget.h"
 #include "tooltip.h"
-#include "automatable_model_templates.h"
 
 
 

src/widgets/ladspa_control_view.cpp

@@ -31,7 +31,6 @@
 #include "led_checkbox.h"
 #include "tempo_sync_knob.h"
 #include "tooltip.h"
-#include "automatable_model_templates.h"
 
 
 ladspaControlView::ladspaControlView( QWidget * _parent,

src/widgets/lcd_spinbox.cpp

@@ -107,8 +107,6 @@ void lcdSpinBox::paintEvent( QPaintEvent * _me )
 
 	QRect cellRect( 0, 0, m_cellWidth, m_cellHeight );
 	
-	int i;
-
 	int margin = 1;// QStyle::PM_DefaultFrameWidth;
 	int lcdWidth = m_cellWidth * (m_numDigits+1) + (margin*2);
 

src/widgets/volume_knob.cpp

@@ -33,7 +33,6 @@
 #include <math.h>
 
 #include "volume_knob.h"
-#include "automatable_model_templates.h"
 #include "main_window.h"
 #include "config_mgr.h"
 #include "engine.h"