Changed the preset location for the audiofileprocessors.

Corrected seg fault in vibed deconstructor.
Add harmonic to vibed save and restore presets.

Corrected load and save seg fault when using gimp like
windows.

Corrected big endian alsa driver.

Changed parameters in single precision trig functions to
use single precision PI.

Modified Files:
  ChangeLog
  Makefile.am
  data/presets/AudioFileProcessor/Bass-Mania.cs.xml
  data/presets/AudioFileProcessor/Fat-Reversed-Kick.cs.xml
  data/presets/AudioFileProcessor/Kick-4-your-Subwoofer.cs.xml
  data/projects/cool_songs/Djeezus-BeatRolls.mmp
  data/projects/cool_songs/Djeezus-Oscilisous.mmp
  data/projects/cool_songs/Marfil-MarfilDrum01.mmp
  data/projects/cool_songs/Mart-Concave_flow.mmp
  data/projects/cool_songs/Mart-Dirt_Track.mmp
  data/projects/cool_songs/MaxFellner-Ease.mmp
  data/projects/cool_songs/SharkyX-DeadManDancing.mmp
  data/projects/cool_songs/SharkyX-Experiments.mmp
  data/projects/cool_songs/Siegel-DreamWave.mmp
  data/projects/cool_songs/TobyDox-Confused.mmp
  data/projects/cool_songs/TobyDox-Psycho.mmp
  data/projects/cool_songs/TobyDox-TheFourthDimension.mmp
  data/projects/covers/J.S.Bach-Preludium_and_Fugue_A-Minor.mmp
  data/projects/demos/basses-demo.mmp
  data/projects/demos/beat_collection.mmp
  data/projects/demos/demo1.mmp data/projects/demos/demo3.mmp
  data/projects/demos/demo5.mmp data/projects/demos/demo6.mmp
  data/projects/demos/loop_collection.mmp
  data/projects/demos/some_basslines.mmp
  data/projects/misc/1st.mmp data/projects/misc/time_machine.mmp
  data/projects/templates/AcousticDrumset.mpt
  data/projects/templates/ClubMix.mpt include/basic_filters.h
  include/interpolation.h include/oscillator.h
  plugins/vibed/nine_button_selector.cpp
  plugins/vibed/nine_button_selector.h plugins/vibed/vibed.cpp
  plugins/vibed/vibed.h src/audio/audio_alsa.cpp
  src/audio/audio_device.cpp src/audio/audio_file_wave.cpp
  src/core/main_window.cpp
  include/lmms_constants.h


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

plugins/vibed/nine_button_selector.cpp

@@ -173,12 +173,7 @@ nineButtonSelector::~ nineButtonSelector()
 
 void nineButtonSelector::button0Clicked( void )
 {
-	m_lastBtn->setChecked( FALSE);
-	m_lastBtn = m_buttons[0];
-	m_lastBtn->setChecked( TRUE );
-	
-	m_selected = 0;
-	emit nineButtonSelection( m_selected );
+	setSelected( 0 );
 }
 
 
@@ -186,12 +181,7 @@ void nineButtonSelector::button0Clicked( void )
 
 void nineButtonSelector::button1Clicked( void )
 {
-	m_lastBtn->setChecked( FALSE);
-	m_lastBtn = m_buttons[1];
-	m_lastBtn->setChecked( TRUE );
-	
-	m_selected = 1;
-	emit nineButtonSelection( m_selected );
+	setSelected( 1 );
 }
 
 
@@ -199,12 +189,7 @@ void nineButtonSelector::button1Clicked( void )
 
 void nineButtonSelector::button2Clicked( void )
 {
-	m_lastBtn->setChecked( FALSE);
-	m_lastBtn = m_buttons[2];
-	m_lastBtn->setChecked( TRUE );
-	
-	m_selected = 2;
-	emit nineButtonSelection( m_selected );
+	setSelected( 2 );
 }
 
 
@@ -212,12 +197,7 @@ void nineButtonSelector::button2Clicked( void )
 
 void nineButtonSelector::button3Clicked( void )
 {
-	m_lastBtn->setChecked( FALSE);
-	m_lastBtn = m_buttons[3];
-	m_lastBtn->setChecked( TRUE );
-	
-	m_selected = 3;
-	emit nineButtonSelection( m_selected );
+	setSelected( 3 );
 }
 
 
@@ -225,12 +205,7 @@ void nineButtonSelector::button3Clicked( void )
 
 void nineButtonSelector::button4Clicked( void )
 {
-	m_lastBtn->setChecked( FALSE);
-	m_lastBtn = m_buttons[4];
-	m_lastBtn->setChecked( TRUE );
-	
-	m_selected = 4;
-	emit nineButtonSelection( m_selected );
+	setSelected( 4 );
 }
 
 
@@ -238,12 +213,7 @@ void nineButtonSelector::button4Clicked( void )
 
 void nineButtonSelector::button5Clicked( void )
 {
-	m_lastBtn->setChecked( FALSE);
-	m_lastBtn = m_buttons[5];
-	m_lastBtn->setChecked( TRUE );
-	
-	m_selected = 5;
-	emit nineButtonSelection( m_selected );
+	setSelected( 5 );
 }
 
 
@@ -251,12 +221,7 @@ void nineButtonSelector::button5Clicked( void )
 
 void nineButtonSelector::button6Clicked( void )
 {
-	m_lastBtn->setChecked( FALSE);
-	m_lastBtn = m_buttons[6];
-	m_lastBtn->setChecked( TRUE );
-	
-	m_selected = 6;
-	emit nineButtonSelection( m_selected );
+	setSelected( 6 );
 }
 
 
@@ -264,12 +229,7 @@ void nineButtonSelector::button6Clicked( void )
 
 void nineButtonSelector::button7Clicked( void )
 {
-	m_lastBtn->setChecked( FALSE);
-	m_lastBtn = m_buttons[7];
-	m_lastBtn->setChecked( TRUE );
-	
-	m_selected = 7;
-	emit nineButtonSelection( m_selected );
+	setSelected( 7 );
 }
 
 
@@ -277,11 +237,20 @@ void nineButtonSelector::button7Clicked( void )
 
 void nineButtonSelector::button8Clicked( void )
 {
-	m_lastBtn->setChecked( FALSE);
-	m_lastBtn = m_buttons[8];
+	setSelected( 8 );
+}
+
+
+
+
+void FASTCALL nineButtonSelector::setSelected( Uint8 _new_button )
+{
+	m_selected = _new_button;
+	
+	m_lastBtn->setChecked( FALSE );
+	m_lastBtn = m_buttons[m_selected];
 	m_lastBtn->setChecked( TRUE );
 	
-	m_selected = 8;
 	emit nineButtonSelection( m_selected );
 }
 

plugins/vibed/nine_button_selector.h

@@ -60,6 +60,7 @@ public:
 	~nineButtonSelector();
 	
 	inline Uint8 getSelected() { return( m_selected ); };
+	void FASTCALL setSelected( Uint8 _new_button );
 	
 public slots:
 	void button0Clicked( void );

plugins/vibed/vibed.cpp

@@ -407,7 +407,6 @@ vibed::vibed( instrumentTrack * _channel_track ) :
 
 vibed::~vibed()
 {
-	delete m_sampleBuffer;
 	for( Uint8 harm = 0; harm < 9; harm++ )
 	{
 		delete m_pickKnobs[harm];
@@ -458,6 +457,10 @@ void vibed::saveSettings( QDomDocument & _doc,
 			_this.setAttribute( name, QString::number( 
 					m_pickupKnobs[i]->value() ) );
 
+			name = "octave" + QString::number( i );
+			_this.setAttribute( name, QString::number( 
+					m_harmonics[i]->getSelected() ) );
+
 			name = "length" + QString::number( i );
 			_this.setAttribute( name, QString::number( 
 					m_lengthKnobs[i]->value() ) );
@@ -519,6 +522,10 @@ void vibed::loadSettings( const QDomElement & _this )
 			m_pickupKnobs[i]->setValue( 
 					_this.attribute( name ).toFloat() );
 		
+			name = "octave" + QString::number( i );
+			m_harmonics[i]->setSelected( 
+					_this.attribute( name ).toInt() );
+			
 			name = "length" + QString::number( i );
 			m_lengthKnobs[i]->setValue( 
 					_this.attribute( name ).toFloat() );

plugins/vibed/vibed.h

@@ -90,8 +90,6 @@ private:
 	
 	ledCheckBox * m_impulse;
 	
-	sampleBuffer * m_sampleBuffer;
-	
 	int m_sampleLength;
 } ;