Merge branch 'master' into feature/recording-stage-one

include/AudioPortAudio.h

@@ -143,7 +143,7 @@ private:
 		void *hostApiSpecificStreamInfo;
 
 	} PaStreamParameters;
-#endif
+#endif // PORTAUDIO_V19
 
 	PaStream * m_paStream;
 	PaStreamParameters m_outputParameters;

include/AudioPulseAudio.h

@@ -102,6 +102,6 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LMMS_HAVE_PULSEAUDIO
 
 #endif

include/AudioSndio.h

@@ -87,6 +87,6 @@ private:
 
 } // namespace lmms
 
-#endif	/* LMMS_HAVE_SNDIO */
+#endif	// LMMS_HAVE_SNDIO
 
-#endif	/* _AUDIO_SNDIO_H */
+#endif	// _AUDIO_SNDIO_H

include/Clip.h

@@ -93,6 +93,12 @@ public:
 		return m_length;
 	}
 
+	/*! \brief Specify whether or not a TCO automatically resizes.
+	 *
+	 *  If a TCO does automatically resize, it cannot be manually
+	 *  resized by clicking and dragging its edge.
+	 *
+	 */
 	inline void setAutoResize( const bool r )
 	{
 		m_autoResize = r;

include/DummyEffect.h

@@ -50,7 +50,7 @@ public:
 
 } ;
 
-}
+} // namespace gui
 
 class DummyEffectControls : public EffectControls
 {

include/DummyPlugin.h

@@ -66,6 +66,6 @@ protected:
 } ;
 
 
-} // namesplace lmms
+} // namespace lmms
 
 #endif

include/IoHelper.h

@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef IO_HELPER_H
+#define IO_HELPER_H
 
 #include "lmmsconfig.h"
 
@@ -37,7 +39,7 @@
 #ifdef LMMS_HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#endif
+#endif // LMMS_BUILD_WIN32
 
 namespace lmms
 {
@@ -87,4 +89,6 @@ int fileToDescriptor(FILE* f, bool closeFile = true)
 }
 
 
-} // namespace lmms
+} // namespace lmms
+
+#endif

include/LmmsPalette.h

@@ -23,12 +23,12 @@
  *
  */
 
-#include <QWidget>
-#include "lmms_export.h"
-
 #ifndef LMMSPALETTE_H
 #define LMMSPALETTE_H
 
+#include <QWidget>
+#include "lmms_export.h"
+
 
 namespace lmms::gui
 {

include/MidiSndio.h

@@ -73,6 +73,6 @@ private:
 
 } // namespace lmms
 
-#endif	/* LMMS_HAVE_SNDIO */
+#endif // LMMS_HAVE_SNDIO
 
-#endif	/* _MIDI_SNDIO_H */
+#endif	// _MIDI_SNDIO_H

include/Piano.h

@@ -82,7 +82,7 @@ private:
 
 	InstrumentTrack* m_instrumentTrack;
 	MidiEventProcessor* m_midiEvProc;
-	bool m_pressedKeys[NumKeys];
+	std::array<bool, NumKeys> m_pressedKeys = {};
 
 } ;
 

include/RemotePluginBase.h

@@ -341,7 +341,7 @@ private:
 	std::atomic_int m_lockDepth;
 
 } ;
-#endif
+#endif // SYNC_WITH_SHM_FIFO
 
 
 
@@ -530,7 +530,7 @@ public:
 		writeInt( len );
 		write( _s.c_str(), len );
 	}
-#endif
+#endif // SYNC_WITH_SHM_FIFO
 
 #ifndef BUILD_REMOTE_PLUGIN_CLIENT
 	inline bool messagesLeft()
@@ -562,7 +562,7 @@ public:
 	{
 		return waitDepthCounter() > 0;
 	}
-#endif
+#endif // BUILD_REMOTE_PLUGIN_CLIENT
 
 	virtual bool processMessage( const message & _m ) = 0;
 
@@ -667,7 +667,7 @@ private:
 
 	pthread_mutex_t m_receiveMutex;
 	pthread_mutex_t m_sendMutex;
-#endif
+#endif // SYNC_WITH_SHM_FIFO
 
 } ;
 

include/RemotePluginClient.h

@@ -173,7 +173,7 @@ private:
 	std::condition_variable m_cv;
 	std::thread m_thread;
 };
-#endif
+#endif // LMMS_BUILD_WIN32
 
 #ifdef SYNC_WITH_SHM_FIFO
 RemotePluginClient::RemotePluginClient( const std::string& _shm_in, const std::string& _shm_out ) :

include/TrackContainerView.h

@@ -148,6 +148,7 @@ public:
 		return "trackcontainerview";
 	}
 
+	unsigned int totalHeightOfTracks() const;
 
 	RubberBand *rubberBand() const;
 
@@ -206,10 +207,9 @@ private:
 
 	RubberBand * m_rubberBand;
 
-
-
 signals:
 	void positionChanged( const lmms::TimePos & _pos );
+	void tracksRealigned();
 
 
 } ;

include/debug.h

@@ -33,7 +33,7 @@
 #ifndef NDEBUG
 	#define NDEBUG
 #endif
-#endif
+#endif // LMMS_DEBUG
 
 #include <cassert>
 #include <cstdio>

include/embed.h

@@ -65,7 +65,7 @@ inline QPixmap getIconPixmap( const QString&  _name,
 }
 //QString getText( const char * _name );
 
-}
+} // namespace PLUGIN_NAME
 
 #endif // PLUGIN_NAME
 

include/lmms_math.h

@@ -118,7 +118,7 @@ static inline float absFraction( float _x )
 }
 #endif
 
-#endif
+#endif // __INTEL_COMPILER
 
 
 
@@ -153,7 +153,7 @@ static inline long double fastFmal( long double a, long double b, long double c
 	#endif
 #else
 	return a * b + c;
-#endif
+#endif // FP_FAST_FMAL
 }
 
 //! @brief Takes advantage of fmaf() function if present in hardware
@@ -167,7 +167,7 @@ static inline float fastFmaf( float a, float b, float c )
 	#endif
 #else
 	return a * b + c;
-#endif
+#endif // FP_FAST_FMAF
 }
 
 //! @brief Takes advantage of fma() function if present in hardware

include/versioninfo.h

@@ -1,3 +1,6 @@
+#ifndef VERSION_INFO_H
+#define VERSION_INFO_H
+
 #include "lmms_basics.h"
 
 #ifdef __GNUC__
@@ -47,3 +50,5 @@ constexpr const char* LMMS_BUILDCONF_PLATFORM = "win32";
 #ifdef LMMS_BUILD_HAIKU
 constexpr const char* LMMS_BUILDCONF_PLATFORM = "Haiku";
 #endif
+
+#endif