Rename BB to Pattern

README.md

@@ -28,7 +28,7 @@ Features
 ---------
 
 * Song-Editor for composing songs
-* A Beat+Bassline-Editor for creating beats and basslines
+* Pattern-Editor for creating beats and patterns
 * An easy-to-use Piano-Roll for editing patterns and melodies
 * A Mixer with unlimited mixer channels and arbitrary number of effects
 * Many powerful instrument and effect-plugins out of the box

data/themes/classic/style.css

@@ -333,7 +333,7 @@ QScrollBar::right-arrow:horizontal:disabled { background-image: url(resources:sb
 QScrollBar::up-arrow:vertical:disabled { background-image: url(resources:sbarrow_up_d.png);}
 QScrollBar::down-arrow:vertical:disabled { background-image: url(resources:sbarrow_down_d.png);}
 
-/* background for song editor and bb-editor */
+/* background for song editor and pattern editor */
 
 TrackContainerView QFrame{
 	background-color: #49515b;
@@ -670,7 +670,7 @@ ClipView   {
 	qproperty-mutedColor: rgb( 128, 128, 128 );
 	qproperty-mutedBackgroundColor: rgb( 80, 80, 80 );
 	qproperty-selectedColor: rgb( 0, 125, 255 );
-	qproperty-BBClipBackground: rgb( 80, 80, 80 );
+	qproperty-patternClipBackground: rgb( 80, 80, 80 );
 	qproperty-textColor: rgb( 255, 255, 255 );
 	qproperty-textBackgroundColor: rgba(0, 0, 0, 75);
 	qproperty-textShadowColor: rgb( 0, 0, 0 );
@@ -705,9 +705,9 @@ AutomationClipView {
 	color: rgb( 204, 215, 255 );
 }
 
-/* bb-clip */
-BBClipView {
-	background-color: rgb( 128, 182, 175 ); /* default colour for bb-tracks */
+/* pattern clip */
+PatternClipView {
+	background-color: rgb( 128, 182, 175 ); /* default colour for pattern tracks */
 }
 
 /* Subwindows in MDI-Area */

data/themes/default/style.css

@@ -369,7 +369,7 @@ QScrollBar::down-arrow:vertical:disabled { background-image: url(resources:sbarr
 EffectRackView QScrollBar::up-arrow:vertical:disabled { background-image: url(resources:sbarrow_up.png);}
 EffectRackView QScrollBar::down-arrow:vertical:disabled { background-image: url(resources:sbarrow_down.png);}
 
-/* background for song editor and bb-editor */
+/* background for song editor and pattern editor */
 
 TrackContainerView QFrame {
 	background-color: #262b30;
@@ -716,7 +716,7 @@ ClipView   {
 	qproperty-mutedColor: rgba(255,255,255,100);
 	qproperty-mutedBackgroundColor: #373d48;
 	qproperty-selectedColor: #006B65;
-	qproperty-BBClipBackground: #373d48;
+	qproperty-patternClipBackground: #373d48;
 	qproperty-textColor: #fff;
 	qproperty-textBackgroundColor: rgba(0, 0, 0, 75);
 	qproperty-textShadowColor: rgba(0,0,0,200);
@@ -751,9 +751,9 @@ AutomationClipView {
 	color: rgba(255,255,255,90);
 }
 
-/* bb-clip */
-BBClipView {
-	background-color: #20BDB2; /* default colour for bb-tracks */
+/* pattern clip */
+PatternClipView {
+	background-color: #20BDB2; /* default colour for pattern tracks */
 }
 
 /* Subwindows in MDI-Area */

include/AutomationEditor.h

@@ -218,7 +218,7 @@ protected slots:
 
 	void drawCross(QPainter & p );
 	void drawAutomationPoint( QPainter & p, timeMap::iterator it );
-	bool inBBEditor();
+	bool inPatternEditor();
 
 	QColor m_barLineColor;
 	QColor m_beatLineColor;

include/ClipView.h

@@ -53,7 +53,7 @@ class ClipView : public selectableObject, public ModelView
 	Q_PROPERTY( QColor textColor READ textColor WRITE setTextColor )
 	Q_PROPERTY( QColor textBackgroundColor READ textBackgroundColor WRITE setTextBackgroundColor )
 	Q_PROPERTY( QColor textShadowColor READ textShadowColor WRITE setTextShadowColor )
-	Q_PROPERTY( QColor BBClipBackground READ BBClipBackground WRITE setBBClipBackground )
+	Q_PROPERTY( QColor patternClipBackground READ patternClipBackground WRITE setPatternClipBackground )
 	Q_PROPERTY( bool gradient READ gradient WRITE setGradient )
 	// We have to use a QSize here because using QPoint isn't supported.
 	// width -> x, height -> y
@@ -83,15 +83,15 @@ class ClipView : public selectableObject, public ModelView
 	QColor textColor() const;
 	QColor textBackgroundColor() const;
 	QColor textShadowColor() const;
-	QColor BBClipBackground() const;
+	QColor patternClipBackground() const;
 	bool gradient() const;
 	void setMutedColor( const QColor & c );
 	void setMutedBackgroundColor( const QColor & c );
 	void setSelectedColor( const QColor & c );
 	void setTextColor( const QColor & c );
 	void setTextBackgroundColor( const QColor & c );
 	void setTextShadowColor( const QColor & c );
-	void setBBClipBackground( const QColor & c );
+	void setPatternClipBackground(const QColor& c);
 	void setGradient( const bool & b );
 
 	// access needsUpdate member variable
@@ -211,7 +211,7 @@ protected slots:
 	QColor m_textColor;
 	QColor m_textBackgroundColor;
 	QColor m_textShadowColor;
-	QColor m_BBClipBackground;
+	QColor m_patternClipBackground;
 	bool m_gradient;
 	QSize m_mouseHotspotHand; // QSize must be used because QPoint
 	QSize m_mouseHotspotKnife; // isn't supported by property system

include/Engine.h

@@ -35,8 +35,8 @@
 #include "lmms_basics.h"
 
 class AudioEngine;
-class BBTrackContainer;
 class Mixer;
+class PatternStore;
 class ProjectJournal;
 class Song;
 class Ladspa2LMMS;
@@ -77,9 +77,9 @@ class LMMS_EXPORT LmmsCore : public QObject
 		return s_song;
 	}
 
-	static BBTrackContainer * getBBTrackContainer()
+	static PatternStore * getPatternStore()
 	{
-		return s_bbTrackContainer;
+		return s_patternStore;
 	}
 
 	static ProjectJournal * projectJournal()
@@ -143,7 +143,7 @@ class LMMS_EXPORT LmmsCore : public QObject
 	static AudioEngine *s_audioEngine;
 	static Mixer * s_mixer;
 	static Song * s_song;
-	static BBTrackContainer * s_bbTrackContainer;
+	static PatternStore * s_patternStore;
 	static ProjectJournal * s_projectJournal;
 
 #ifdef LMMS_HAVE_LV2

include/ExportFilter.h

@@ -40,7 +40,7 @@ class LMMS_EXPORT ExportFilter : public Plugin
 
 
 	virtual bool tryExport(const TrackContainer::TrackList &tracks,
-				const TrackContainer::TrackList &tracksBB,
+				const TrackContainer::TrackList &patternTracks,
 				int tempo, int masterPitch, const QString &filename ) = 0;
 protected:
 

include/GuiApplication.h

@@ -33,11 +33,11 @@
 class QLabel;
 
 class AutomationEditorWindow;
-class BBEditor;
 class ControllerRackView;
 class MixerView;
 class MainWindow;
 class MicrotunerConfig;
+class PatternEditor;
 class PianoRollWindow;
 class ProjectNotes;
 class SongEditorWindow;
@@ -57,7 +57,7 @@ class LMMS_EXPORT GuiApplication : public QObject
 	MainWindow* mainWindow() { return m_mainWindow; }
 	MixerView* mixerView() { return m_mixerView; }
 	SongEditorWindow* songEditor() { return m_songEditor; }
-	BBEditor* getBBEditor() { return m_bbEditor; }
+	PatternEditor* getPatternEditor() { return m_patternEditor; }
 	PianoRollWindow* pianoRoll() { return m_pianoRoll; }
 	ProjectNotes* getProjectNotes() { return m_projectNotes; }
 	MicrotunerConfig* getMicrotunerConfig() { return m_microtunerConfig; }
@@ -77,7 +77,7 @@ private slots:
 	MixerView* m_mixerView;
 	SongEditorWindow* m_songEditor;
 	AutomationEditorWindow* m_automationEditor;
-	BBEditor* m_bbEditor;
+	PatternEditor* m_patternEditor;
 	PianoRollWindow* m_pianoRoll;
 	ProjectNotes* m_projectNotes;
 	MicrotunerConfig* m_microtunerConfig;

include/MainWindow.h

@@ -149,7 +149,7 @@ public slots:
 	void aboutLMMS();
 	void help();
 	void toggleAutomationEditorWin();
-	void toggleBBEditorWin( bool forceShow = false );
+	void togglePatternEditorWin(bool forceShow = false);
 	void toggleSongEditorWin();
 	void toggleProjectNotesWin();
 	void toggleMicrotunerWin();

include/MidiClip.h

@@ -110,7 +110,7 @@ class LMMS_EXPORT MidiClip : public Clip
 
 
 protected:
-	void updateBBTrack();
+	void updatePatternTrack();
 
 
 protected slots:
@@ -140,7 +140,7 @@ protected slots:
 	MidiClip * adjacentMidiClipByOffset(int offset) const;
 
 	friend class MidiClipView;
-	friend class BBTrackContainerView;
+	friend class PatternStoreView;
 
 
 signals:

include/MidiClipView.h

@@ -93,7 +93,7 @@ protected slots:
 
 	QStaticText m_staticTextName;
 
-	bool m_legacySEBB;
+	bool m_legacySEPattern;
 } ;
 
 

include/NotePlayHandle.h

@@ -231,16 +231,16 @@ class LMMS_EXPORT NotePlayHandle : public PlayHandle, public Note
 	/*! Returns whether given NotePlayHandle instance is equal to *this */
 	bool operator==( const NotePlayHandle & _nph ) const;
 
-	/*! Returns whether NotePlayHandle belongs to BB track and BB track is muted */
-	bool isBbTrackMuted()
+	/*! Returns whether NotePlayHandle belongs to pattern track and pattern track is muted */
+	bool isPatternTrackMuted()
 	{
-		return m_bbTrack && m_bbTrack->isMuted();
+		return m_patternTrack && m_patternTrack->isMuted();
 	}
 
-	/*! Sets attached BB track */
-	void setBBTrack( Track* t )
+	/*! Sets attached pattern track */
+	void setPatternTrack(Track* t)
 	{
-		m_bbTrack = t;
+		m_patternTrack = t;
 	}
 
 	/*! Process note detuning automation */
@@ -311,7 +311,7 @@ class LMMS_EXPORT NotePlayHandle : public PlayHandle, public Note
 	NotePlayHandle * m_parent;			// parent note
 	bool m_hadChildren;
 	bool m_muted;							// indicates whether note is muted
-	Track* m_bbTrack;						// related BB track
+	Track* m_patternTrack;						// related pattern track
 
 	// tempo reaction
 	bpm_t m_origTempo;						// original tempo

include/BBClip.h → include/PatternClip.h

@@ -1,5 +1,5 @@
 /*
- * BBClip.h
+ * PatternClip.h
  *
  * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
@@ -23,17 +23,17 @@
  */
 
 
-#ifndef BB_CLIP_H
-#define BB_CLIP_H
+#ifndef PATTERN_CLIP_H
+#define PATTERN_CLIP_H
 
 #include "ClipView.h"
 
 
-class BBClip : public Clip
+class PatternClip : public Clip
 {
 public:
-	BBClip( Track * _track );
-	virtual ~BBClip() = default;
+	PatternClip(Track* track);
+	virtual ~PatternClip() = default;
 
 	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
 	void loadSettings( const QDomElement & _this ) override;
@@ -42,14 +42,14 @@ class BBClip : public Clip
 		return( "bbtco" );
 	}
 
-	int bbTrackIndex();
+	int patternTrackIndex();
 
 	ClipView * createView( TrackView * _tv ) override;
 
 private:
-	friend class BBClipView;
+	friend class PatternClipView;
 } ;
 
 
 
-#endif
+#endif