Merge remote-tracking branch 'upstream/master' into 7512-MaximizeButt…

…onForResizableInstruments Conflicts: * include/SubWindow.h * src/gui/SubWindow.cpp
michaelgregorius · Oct 10, 2024 · f677b8c · f677b8c
2 parents 9aab76b + 378ff8b
commit f677b8c
Show file tree

Hide file tree

Showing 135 changed files with 248,452 additions and 197,049 deletions.
diff --git a/.tx/config b/.tx/config
@@ -3,9 +3,8 @@ host = https://www.transifex.com
 minimum_perc = 51
 #Need to finish at least 51% before merging back
 
-[lmms.lmms]
+[o:lmms:p:lmms:r:lmms]
 file_filter = data/locale/<lang>.ts
 source_file = data/locale/en.ts
 source_lang = en
-type = QT
-
+type        = QT
diff --git a/data/locale/cs.ts b/data/locale/cs.ts
diff --git a/data/locale/de.ts b/data/locale/de.ts
diff --git a/data/locale/es.ts b/data/locale/es.ts
diff --git a/data/locale/eu.ts b/data/locale/eu.ts
diff --git a/data/locale/fr.ts b/data/locale/fr.ts
diff --git a/data/locale/he.ts b/data/locale/he.ts
diff --git a/data/locale/hu_HU.ts b/data/locale/hu_HU.ts
diff --git a/data/locale/id.ts b/data/locale/id.ts
diff --git a/data/locale/it.ts b/data/locale/it.ts
diff --git a/data/locale/ja.ts b/data/locale/ja.ts
diff --git a/data/locale/ko.ts b/data/locale/ko.ts
diff --git a/data/locale/nl.ts b/data/locale/nl.ts
diff --git a/data/locale/pl.ts b/data/locale/pl.ts
diff --git a/data/locale/pt.ts b/data/locale/pt.ts
diff --git a/data/locale/ru.ts b/data/locale/ru.ts
diff --git a/data/locale/sl.ts b/data/locale/sl.ts
diff --git a/data/locale/sv.ts b/data/locale/sv.ts
diff --git a/data/locale/tr.ts b/data/locale/tr.ts
diff --git a/data/locale/uk.ts b/data/locale/uk.ts
diff --git a/data/locale/zh_CN.ts b/data/locale/zh_CN.ts
diff --git a/data/locale/zh_TW.ts b/data/locale/zh_TW.ts
diff --git a/data/themes/default/style.css b/data/themes/default/style.css
@@ -601,35 +601,24 @@ lmms--gui--TrackLabelButton:hover {
 	background: #3B424A;
 	border: 1px solid #515B66;
 	border-radius: none;
-	font-size: 11px;
-	font-weight: normal;
-	padding: 2px 1px;
 }
 
 lmms--gui--TrackLabelButton:pressed {
 	background: #262B30;
 	border-radius: none;
-	font-size: 11px;
-	font-weight: normal;
-	padding: 2px 1px;
 }
 
 lmms--gui--TrackLabelButton:checked {
 	border: 1px solid #485059;
 	background: #1C1F24;
 	background-image: url("resources:track_shadow_p.png");
 	border-radius: none;
-	font-size: 11px;
-	font-weight: normal;
-	padding: 2px 1px;
 }
 
 lmms--gui--TrackLabelButton:checked:pressed {
 	border: 1px solid #2f353b;
 	background: #0e1012;
 	background-image: url("resources:track_shadow_p.png");
-	font-size: 11px;
-	padding: 2px 1px;
 	font-weight: solid;
 }
 

diff --git a/include/AudioEngine.h b/include/AudioEngine.h
@@ -50,14 +50,15 @@ class AudioPort;
 class AudioEngineWorkerThread;
 
 
-const fpp_t MINIMUM_BUFFER_SIZE = 32;
-const fpp_t DEFAULT_BUFFER_SIZE = 256;
+constexpr fpp_t MINIMUM_BUFFER_SIZE = 32;
+constexpr fpp_t DEFAULT_BUFFER_SIZE = 256;
+constexpr fpp_t MAXIMUM_BUFFER_SIZE = 4096;
 
-const int BYTES_PER_SAMPLE = sizeof( sample_t );
-const int BYTES_PER_INT_SAMPLE = sizeof( int_sample_t );
-const int BYTES_PER_FRAME = sizeof( SampleFrame );
+constexpr int BYTES_PER_SAMPLE = sizeof(sample_t);
+constexpr int BYTES_PER_INT_SAMPLE = sizeof(int_sample_t);
+constexpr int BYTES_PER_FRAME = sizeof(SampleFrame);
 
-const float OUTPUT_SAMPLE_MULTIPLIER = 32767.0f;
+constexpr float OUTPUT_SAMPLE_MULTIPLIER = 32767.0f;
 
 class LMMS_EXPORT AudioEngine : public QObject
 {

diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h
@@ -241,6 +241,8 @@ protected slots:
 	QScrollBar * m_leftRightScroll;
 	QScrollBar * m_topBottomScroll;
 
+	void adjustLeftRightScoll(int value);
+
 	TimePos m_currentPosition;
 
 	Action m_action;

diff --git a/include/DummyEffect.h b/include/DummyEffect.h
@@ -98,6 +98,7 @@ class DummyEffect : public Effect
 		m_originalPluginData( originalPluginData )
 	{
 		setName();
+		setDontRun(true);
 	}
 
 	~DummyEffect() override = default;
@@ -107,9 +108,9 @@ class DummyEffect : public Effect
 		return &m_controls;
 	}
 
-	bool processAudioBuffer( SampleFrame*, const fpp_t ) override
+	ProcessStatus processImpl(SampleFrame*, const fpp_t) override
 	{
-		return false;
+		return ProcessStatus::Sleep;
 	}
 
 	const QDomElement& originalPluginData() const

diff --git a/include/Editor.h b/include/Editor.h
@@ -56,7 +56,7 @@ class Editor : public QMainWindow
 	DropToolBar * addDropToolBar(Qt::ToolBarArea whereToAdd, QString const & windowTitle);
 	DropToolBar * addDropToolBar(QWidget * parent, Qt::ToolBarArea whereToAdd, QString const & windowTitle);
 
-	void closeEvent( QCloseEvent * _ce ) override;
+	void closeEvent(QCloseEvent * event) override;
 protected slots:
 	virtual void play() {}
 	virtual void record() {}

diff --git a/include/Effect.h b/include/Effect.h
@@ -63,9 +63,8 @@ class LMMS_EXPORT Effect : public Plugin
 		return "effect";
 	}
 
-
-	virtual bool processAudioBuffer( SampleFrame* _buf,
-						const fpp_t _frames ) = 0;
+	//! Returns true if audio was processed and should continue being processed
+	bool processAudioBuffer(SampleFrame* buf, const fpp_t frames);
 
 	inline ch_cnt_t processorCount() const
 	{
@@ -174,14 +173,29 @@ class LMMS_EXPORT Effect : public Plugin
 
 
 protected:
+	enum class ProcessStatus
+	{
+		//! Unconditionally continue processing
+		Continue,
+
+		//! Calculate the RMS out sum and call `checkGate` to determine whether to stop processing
+		ContinueIfNotQuiet,
+
+		//! Do not continue processing
+		Sleep
+	};
+
 	/**
-		Effects should call this at the end of audio processing
+	 * The main audio processing method that runs when plugin is not asleep
+	 */
+	virtual ProcessStatus processImpl(SampleFrame* buf, const fpp_t frames) = 0;
+
+	/**
+	 * Optional method that runs when plugin is sleeping (not enabled,
+	 * not running, not in the Okay state, or in the Don't Run state)
+	 */
+	virtual void processBypassedImpl() {}
 
-		If the setting "Keep effects running even without input" is disabled,
-		after "decay" ms of a signal below "gate", the effect is turned off
-		and won't be processed again until it receives new audio input
-	*/
-	void checkGate( double _out_sum );
 
 	gui::PluginView* instantiateView( QWidget * ) override;
 
@@ -212,6 +226,14 @@ class LMMS_EXPORT Effect : public Plugin
 
 
 private:
+	/**
+		If the setting "Keep effects running even without input" is disabled,
+		after "decay" ms of a signal below "gate", the effect is turned off
+		and won't be processed again until it receives new audio input
+	*/
+	void checkGate(double outSum);
+
+
 	EffectChain * m_parent;
 	void resample( int _i, const SampleFrame* _src_buf,
 					sample_rate_t _src_sr,

diff --git a/include/gui_templates.h → include/FontHelper.h b/include/gui_templates.h → include/FontHelper.h
@@ -1,5 +1,5 @@
 /*
- * gui_templates.h - GUI-specific templates
+ * FontHelper.h - Header function to help with fonts
  *
  * Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
@@ -22,12 +22,16 @@
  *
  */
 
-#ifndef LMMS_GUI_TEMPLATES_H
-#define LMMS_GUI_TEMPLATES_H
+#ifndef LMMS_FONT_HELPER_H
+#define LMMS_FONT_HELPER_H
 
 #include <QApplication>
 #include <QFont>
 
+constexpr int DEFAULT_FONT_SIZE = 12;
+constexpr int SMALL_FONT_SIZE = 10;
+constexpr int LARGE_FONT_SIZE = 14;
+
 namespace lmms::gui
 {
 
@@ -40,4 +44,4 @@ inline QFont adjustedToPixelSize(QFont font, int size)
 
 } // namespace lmms::gui
 
-#endif // LMMS_GUI_TEMPLATES_H
+#endif // LMMS_FONT_HELPER_H
diff --git a/include/MainWindow.h b/include/MainWindow.h
@@ -72,6 +72,8 @@ class MainWindow : public QMainWindow
 	LMMS_EXPORT SubWindow* addWindowedWidget(QWidget *w, Qt::WindowFlags windowFlags = QFlag(0));
 
 
+	void refocus();
+
 	///
 	/// \brief	Asks whether changes made to the project are to be saved.
 	///
@@ -195,7 +197,6 @@ private slots:
 	void finalize();
 
 	void toggleWindow( QWidget *window, bool forceShow = false );
-	void refocus();
 
 	void exportProject(bool multiExport = false);
 	void handleSaveResult(QString const & filename, bool songSavedSuccessfully);