More Automation refactoring

include/AutomationEditor.h

@@ -68,8 +68,6 @@ public:
 		return m_pattern != nullptr;
 	}
 
-	int quantization() const;
-
 	virtual void saveSettings(QDomDocument & doc, QDomElement & parent);
 	virtual void loadSettings(const QDomElement & parent);
 	QString nodeName() const
@@ -147,6 +145,8 @@ protected slots:
 	void zoomingXChanged();
 	void zoomingYChanged();
 
+	/// Updates the pattern's quantization using the current user selected value.
+	void setQuantization();
 
 private:
 
@@ -260,7 +260,7 @@ public:
 	void setCurrentPattern(AutomationPattern* pattern);
 	const AutomationPattern* currentPattern();
 
-	int quantization() const;
+	void open(AutomationPattern* pattern);
 
 	AutomationEditor* m_editor;
 

include/AutomationPattern.h

@@ -136,15 +136,8 @@ public:
 	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	virtual void loadSettings( const QDomElement & _this );
 
-	static inline const QString classNodeName()
-	{
-		return "automationpattern";
-	}
-
-	inline virtual QString nodeName() const
-	{
-		return classNodeName();
-	}
+	static const QString classNodeName() { return "automationpattern"; }
+	QString nodeName() const { return classNodeName(); }
 
 	void processMidiTime( const MidiTime & _time );
 
@@ -156,19 +149,14 @@ public:
 	static AutomationPattern * globalAutomationPattern( AutomatableModel * _m );
 	static void resolveAllIDs();
 
-	bool isRecording() const
-	{
-		return m_isRecording;
-	}
-	
-	void setRecording( const bool b )
-	{
-		m_isRecording = b;
-	}
+	bool isRecording() const { return m_isRecording; }
+	void setRecording( const bool b ) { m_isRecording = b; }
+
+	static int quantization() { return s_quantization; }
+	static void setQuantization(int q) { s_quantization = q; }
 
 public slots:
 	void clear();
-	void openInAutomationEditor();
 	void objectDestroyed( jo_id_t );
 
 private:
@@ -192,6 +180,8 @@ private:
 	bool m_isRecording;
 	float m_lastRecordedValue;
 
+	static int s_quantization;
+
 	static const float DEFAULT_MIN_VALUE;
 	static const float DEFAULT_MAX_VALUE;
 

include/Note.h

@@ -202,11 +202,10 @@ public:
 	{
 		return m_detuning;
 	}
-
-	void editDetuningPattern();
-
 	bool hasDetuningInfo() const;
 
+	void createDetuning();
+
 
 protected:
 	virtual void saveSettings( QDomDocument & _doc,
@@ -228,10 +227,7 @@ private:
 	MidiTime m_length;
 	MidiTime m_pos;
 	DetuningHelper * m_detuning;
-
-	void createDetuning();
-
-} ;
+};
 
 
 typedef QVector<Note *> NoteVector;