initial controllers code

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

src/core/controller.cpp

@@ -0,0 +1,110 @@
+#ifndef SINGLE_SOURCE_COMPILE
+
+/*
+ * controller.cpp - implementation of class controller which handles remote-control
+ *                  of automatableModels
+ *
+ * Copyright (c) 2008 Paul Giblock <drfaygo/at/gmail.com>
+ *
+ * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include <math.h>
+#include <Qt/QtXml>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
+
+
+#include "song.h"
+#include "engine.h"
+#include "mixer.h"
+#include "controller.h"
+
+unsigned int controller::s_frames = 0;
+QVector<controller *> controller::s_controllers;
+
+controller::controller( void )
+{
+	s_controllers.append( this );
+}
+
+
+controller::~controller()
+{
+	s_controllers.remove( s_controllers.indexOf( this ) );
+
+}
+
+
+// Get current value, with an offset into the current buffer for sample exactness
+float controller::currentValue( int _offset )
+{
+	if( _offset == 0 || isSampleExact() )
+	{
+		m_currentValue = value( _offset );
+	}
+	
+	return m_currentValue;
+}
+
+
+float controller::value( int _offset )
+{
+	// 44100 frames/sec
+	return 0.5 + sinf((float)(runningFrames()) / 44100.0f) / 2;
+}
+	
+
+
+// Get position in frames
+int controller::runningFrames()
+{
+	return s_frames;
+}
+
+// Get position in seconds
+float controller::runningTime()
+{
+	return s_frames /
+			engine::getMixer()->sampleRate() ;
+}
+
+
+void controller::triggerFrameCounter( void )
+{
+	for( int i = 0; i < s_controllers.size(); ++i ) 
+	{
+		emit s_controllers.at(i)->valueChanged();
+	}
+
+	s_frames += engine::getMixer()->framesPerPeriod();
+	//emit s_signaler.triggerValueChanged();
+}
+
+void controller::resetFrameCounter( void )
+{
+	s_frames = 0;
+}
+
+
+
+#include "controller.moc"
+
+
+#endif

src/core/mixer.cpp

@@ -540,6 +540,7 @@ if( COND_NPH )
 
 	// and trigger LFOs
 	envelopeAndLFOParameters::triggerLFO();
+	controller::triggerFrameCounter();
 
 	const float new_cpu_load = timer.elapsed() / 10000.0f * sampleRate() /
 							m_framesPerPeriod;

src/gui/widgets/knob.cpp

@@ -287,8 +287,8 @@ void knob::contextMenuEvent( QContextMenuEvent * )
 					SLOT( openInAutomationEditor() ) );
 		contextMenu.addSeparator();
 	}
-/*	contextMenu.addAction( tr( "Connect to MIDI-device" ), this,
-						SLOT( connectToMidiDevice() ) );*/
+	contextMenu.addAction( tr( "Connect to controller..." ), this,
+						SLOT( connectToController() ) );
 	contextMenu.addSeparator();
 	contextMenu.addAction( embed::getIconPixmap( "help" ), tr( "&Help" ),
 						this, SLOT( displayHelp() ) );
@@ -575,6 +575,15 @@ void knob::connectToMidiDevice( void )
 }
 
 
+void knob::connectToController( void )
+{
+    // TODO[pg]: Display a dialog with list of controllers currently in the song
+    // in addition to any system MIDI controllers
+
+    controller * c = new controller();
+
+    model()->setController( c );
+}
 
 
 void knob::displayHelp( void )

src/tracks/pattern.cpp

@@ -1152,8 +1152,8 @@ void patternView::paintEvent( QPaintEvent * )
 					{
 						Sint16 x1 = 2 * x_base +
 		static_cast<int>( ( *it )->pos() * ppt / 64 );
-						Sint16 x2 = x1 +
-			static_cast<int>( ( *it )->length() * ppt / 64 );
+						Sint16 x2 =
+			static_cast<int>( ( ( *it )->pos() + ( *it )->length() ) * ppt / 64 );
 						p.drawLine( x1, y_base + y_pos,
 							x2, y_base + y_pos );