Merge branch 'master' into feature/bbAssignAllToFX

	Fixes conflicts from file splitting.

data/themes/classic/style.css

@@ -692,8 +692,8 @@ PatternView {
 
 /* sample track pattern */
 SampleTCOView {
-	background-color: rgb( 74, 253, 133 );
-	color: rgb( 187, 227, 236 );
+	background-color: rgba(42,51,59,255);
+	color: #FF8F05;
 }
 
 /* automation pattern */

data/themes/default/style.css

@@ -738,8 +738,8 @@ PatternView {
 
 /* sample track pattern */
 SampleTCOView {
-	background-color: #DE7C05;
-	color: #FFE8CD;
+	background-color: rgba(42,51,59,255);
+	color: #FF8F05;
 }
 
 /* automation pattern */

doc/bash-completion/lmms

@@ -89,7 +89,7 @@ _lmms()
     pars_render=(--float --bitrate --format --interpolation)
     pars_render+=(--loop --mode --output --profile)
     pars_render+=(--samplerate --oversampling)
-    actions=(dump compress render rendertracks upgrade)
+    actions=(dump compress render rendertracks upgrade makebundle)
     actions_old=(-d --dump -r --render --rendertracks -u --upgrade)
     shortargs+=(-a -b -c -f -h -i -l -m -o -p -s -v -x)
 
@@ -250,6 +250,17 @@ _lmms()
                     filemode="files"
                     filetypes="$savefiletypes"
                 fi
+            elif [ "$action_found" == "makebundle" ]
+            then
+                if [ "$prev" == "makebundle" ]
+                then
+                    filemode="existing_files"
+                    filetypes="$savefiletypes"
+                elif [ "$prev2" == "makebundle" ]
+                then
+                    filemode="files"
+                    filetypes="$savefiletypes"
+                fi
             elif [[ "$action_found" =~ render(tracks)? ]]
             then
                 if [[ "$prev" =~ render(tracks)? ]]

include/AutomatableModel.h

@@ -148,7 +148,18 @@ class LMMS_EXPORT AutomatableModel : public Model, public JournallingObject
 	template<class T>
 	inline T value( int frameOffset = 0 ) const
 	{
-		if( hasLinkedModels() || m_controllerConnection != NULL )
+		if (m_controllerConnection)
+		{
+			if (!m_useControllerValue)
+			{
+				return castValue<T>(m_value);
+			}
+			else
+			{
+				return castValue<T>(controllerValue(frameOffset));
+			}
+		}
+		else if (hasLinkedModels())
 		{
 			return castValue<T>( controllerValue( frameOffset ) );
 		}
@@ -298,9 +309,15 @@ class LMMS_EXPORT AutomatableModel : public Model, public JournallingObject
 		s_periodCounter = 0;
 	}
 
+	bool useControllerValue()
+	{
+		return m_useControllerValue;
+	}
+
 public slots:
 	virtual void reset();
 	void unlinkControllerConnection();
+	void setUseControllerValue(bool b = true);
 
 
 protected:
@@ -395,6 +412,8 @@ public slots:
 	// prevent several threads from attempting to write the same vb at the same time
 	QMutex m_valueBufferMutex;
 
+	bool m_useControllerValue;
+
 signals:
 	void initValueChanged( float val );
 	void destroyed( jo_id_t id );

include/AutomationEditor.h

@@ -98,6 +98,7 @@ public slots:
 	void keyPressEvent(QKeyEvent * ke) override;
 	void leaveEvent(QEvent * e) override;
 	void mousePressEvent(QMouseEvent * mouseEvent) override;
+	void mouseDoubleClickEvent(QMouseEvent * mouseEvent) override;
 	void mouseReleaseEvent(QMouseEvent * mouseEvent) override;
 	void mouseMoveEvent(QMouseEvent * mouseEvent) override;
 	void paintEvent(QPaintEvent * pe) override;
@@ -112,6 +113,7 @@ public slots:
 	timeMap::iterator getNodeAt(int x, int y, bool outValue = false, int r = 5);
 
 	void drawLine( int x0, float y0, int x1, float y1 );
+	bool fineTuneValue(timeMap::iterator node, bool editingOutValue);
 
 protected slots:
 	void play();

include/AutomationNode.h

@@ -130,6 +130,16 @@ class AutomationNode
 		m_outTangent = tangent;
 	}
 
+	/**
+	 * @brief Sets the pattern this node belongs to
+	 * @param AutomationPattern* pattern that m_pattern will be
+	 * set to
+	 */
+	inline void setPattern(AutomationPattern* pat)
+	{
+		m_pattern = pat;
+	}
+
 private:
 	// Pattern that this node belongs to
 	AutomationPattern* m_pattern;

include/AutomationTrack.h

@@ -28,7 +28,6 @@
 #define AUTOMATION_TRACK_H
 
 #include "Track.h"
-#include "TrackView.h"
 
 
 class AutomationTrack : public Track
@@ -59,17 +58,4 @@ class AutomationTrack : public Track
 } ;
 
 
-
-class AutomationTrackView : public TrackView
-{
-public:
-	AutomationTrackView( AutomationTrack* at, TrackContainerView* tcv );
-	virtual ~AutomationTrackView() = default;
-
-	void dragEnterEvent( QDragEnterEvent * _dee ) override;
-	void dropEvent( QDropEvent * _de ) override;
-
-} ;
-
-
 #endif

include/AutomationTrackView.h

@@ -0,0 +1,44 @@
+/*
+ * AutomationTrackView.h - declaration of class AutomationTrackView
+ *
+ * Copyright (c) 2008-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2006-2008 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
+ *
+ * This file is part of LMMS - https://lmms.io
+ *
+ * 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.
+ *
+ */
+
+#ifndef AUTOMATION_TRACK_VIEW_H
+#define AUTOMATION_TRACK_VIEW_H
+
+#include "AutomationTrack.h"
+#include "TrackView.h"
+
+
+class AutomationTrackView : public TrackView
+{
+public:
+	AutomationTrackView( AutomationTrack* at, TrackContainerView* tcv );
+	virtual ~AutomationTrackView() = default;
+
+	void dragEnterEvent( QDragEnterEvent * _dee ) override;
+	void dropEvent( QDropEvent * _de ) override;
+} ;
+
+
+#endif

plugins/Flanger/QuadratureLfo.cpp → include/BBTCO.h

@@ -1,7 +1,7 @@
 /*
- * quadraturelfo.cpp - defination of QuadratureLfo class.
+ * BBTCO.h
  *
- * Copyright (c) 2014 David French <dave/dot/french3/at/googlemail/dot/com>
+ * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
  * This file is part of LMMS - https://lmms.io
  *
@@ -21,18 +21,35 @@
  * Boston, MA 02110-1301 USA.
  *
  */
+
 
-#include "QuadratureLfo.h"
+#ifndef BB_TCO_H
+#define BB_TCO_H
+
+#include "TrackContentObjectView.h"
 
-QuadratureLfo::QuadratureLfo( int sampleRate )
-{
-	setSampleRate(sampleRate);
-}
 
-void QuadratureLfo::tick( float *s, float *c )
+class BBTCO : public TrackContentObject
 {
-	*s = sinf( m_phase );
-	*c = cosf( m_phase );
-	m_phase += m_increment;
+public:
+	BBTCO( Track * _track );
+	virtual ~BBTCO() = default;
+
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
+	inline QString nodeName() const override
+	{
+		return( "bbtco" );
+	}
+
+	int bbTrackIndex();
+
+	TrackContentObjectView * createView( TrackView * _tv ) override;
+
+private:
+	friend class BBTCOView;
+} ;
+
+
 
-}
+#endif

include/BBTCOView.h

@@ -0,0 +1,66 @@
+/*
+ * BBTCOView.h
+ *
+ * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
+ * This file is part of LMMS - https://lmms.io
+ *
+ * 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.
+ *
+ */
+
+
+#ifndef BB_TCO_VIEW_H
+#define BB_TCO_VIEW_H
+
+#include "BBTCO.h"
+
+#include <QStaticText>
+
+
+class BBTCOView : public TrackContentObjectView
+{
+	Q_OBJECT
+public:
+	BBTCOView( TrackContentObject * _tco, TrackView * _tv );
+	virtual ~BBTCOView() = default;
+
+
+public slots:
+	void update() override;
+
+protected slots:
+	void openInBBEditor();
+	void resetName();
+	void changeName();
+
+
+protected:
+	void paintEvent( QPaintEvent * pe ) override;
+	void mouseDoubleClickEvent( QMouseEvent * _me ) override;
+	void constructContextMenu( QMenu * ) override;
+
+
+private:
+	BBTCO * m_bbTCO;
+	QPixmap m_paintPixmap;
+
+	QStaticText m_staticTextName;
+} ;
+
+
+
+#endif