Recording after rebase to master

.travis/linux..install.sh

@@ -3,7 +3,7 @@
 set -e
 
 PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libmp3lame-dev
-	libasound2-dev libjack-jackd2-dev libsdl-dev libsamplerate0-dev libstk0-dev stk
+	libasound2-dev libjack-jackd2-dev libsdl2-dev libsamplerate0-dev libstk0-dev stk
 	libfluidsynth-dev portaudio19-dev g++-multilib libfltk1.3-dev
 	libgig-dev libsoundio-dev qt59base qt59translations qt59tools"
 

.travis/linux.win.install_raw.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+while read -r PACKAGE_URL_AND_OPTS; do
+    pushd "$PWD"
+    IFS=',' read -ra PACKAGE_URL_AND_OPTS <<< "$PACKAGE_URL_AND_OPTS"
+
+    PACKAGE_URL="${PACKAGE_URL_AND_OPTS[0]}"
+    OPTS="${PACKAGE_URL_AND_OPTS[1]}"
+
+    echo "Downloading $PACKAGE_URL ..."
+
+    mkdir PACKAGE_URL_TEMP
+    cd PACKAGE_URL_TEMP || exit 1
+
+    curl "$PACKAGE_URL" | tar xfz -
+    dir_name=$(ls)
+    cd "$dir_name" || exit 1
+
+    echo "Installing package $dir_name (make ${OPTS}) ..."
+
+    # shellcheck disable=SC2086
+    sudo make $OPTS
+
+    popd
+    rm -rf PACKAGE_URL_TEMP
+done <<< "$MANUAL_PACKAGES_URLS"
+

.travis/linux.win32.install.sh

@@ -9,7 +9,9 @@ MINGW_PACKAGES="mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x
 	mingw32-x-libgig mingw32-x-libsoundio mingw32-x-lame mingw32-x-qt5base"
 
 # swh build dependencies
-SWH_PACKAGES="perl libxml2-utils libxml-perl liblist-moreutils-perl"
+SWH_PACKAGES="perl libxml2-utils libxml-perl liblist-moreutils-perl libjack-dev"
+
+export MANUAL_PACKAGES_URLS="https://www.libsdl.org/release/SDL2-devel-2.0.7-mingw.tar.gz,install-package arch=i686-w64-mingw32 prefix=/opt/mingw32"
 
 export MINGW_PACKAGES
 
@@ -20,6 +22,8 @@ PACKAGES="nsis cloog-isl libmpc3 qt4-linguist-tools mingw32 $MINGW_PACKAGES $SWH
 # shellcheck disable=SC2086
 sudo apt-get install -y $PACKAGES
 
+"$TRAVIS_BUILD_DIR/.travis/linux.win.install_raw.sh"
+
 # ccache 3.2 is needed because mingw32-x-gcc is version 4.9, which causes cmake
 # to use @file command line passing, which in turn ccache 3.1.9 doesn't support
 pushd /tmp

.travis/linux.win64.install.sh

@@ -10,10 +10,14 @@ MINGW_PACKAGES="mingw64-x-sdl mingw64-x-libvorbis mingw64-x-fluidsynth mingw64-x
 	mingw64-x-fftw mingw64-x-flac mingw64-x-fltk mingw64-x-libsamplerate
 	mingw64-x-pkgconfig mingw64-x-binutils mingw64-x-gcc mingw64-x-runtime
 	mingw64-x-libgig mingw64-x-libsoundio mingw64-x-lame mingw64-x-qt5base"
+
+export MANUAL_PACKAGES_URLS="https://www.libsdl.org/release/SDL2-devel-2.0.7-mingw.tar.gz,install-package arch=x86_64-w64-mingw32 prefix=/opt/mingw64"
 
 export MINGW_PACKAGES
 
 "$TRAVIS_BUILD_DIR/.travis/linux.win.download.sh" win64
 
 # shellcheck disable=SC2086
 sudo apt-get install -y $MINGW_PACKAGES
+
+"$TRAVIS_BUILD_DIR/.travis/linux.win.install_raw.sh"

CMakeLists.txt

@@ -90,7 +90,7 @@ ENDIF(LMMS_BUILD_APPLE)
 
 IF(LMMS_BUILD_WIN32)
 	SET(WANT_ALSA OFF)
-	SET(WANT_JACK OFF)
+        SET(WANT_JACK ON)
 	SET(WANT_PULSEAUDIO OFF)
 	SET(WANT_SNDIO OFF)
 	SET(WANT_SOUNDIO OFF)
@@ -140,7 +140,7 @@ CHECK_INCLUDE_FILES(locale.h LMMS_HAVE_LOCALE_H)
 
 LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}")
 
-FIND_PACKAGE(Qt5 COMPONENTS Core Gui Widgets Xml REQUIRED)
+FIND_PACKAGE(Qt5 COMPONENTS Core Gui Widgets Xml Concurrent REQUIRED)
 FIND_PACKAGE(Qt5 COMPONENTS LinguistTools QUIET)
 
 INCLUDE_DIRECTORIES(
@@ -382,21 +382,49 @@ ENDIF(NOT LMMS_HAVE_ALSA)
 IF(WANT_JACK)
 	PKG_CHECK_MODULES(JACK jack>=0.77)
 	IF(JACK_FOUND)
-		IF(WANT_WEAKJACK)
-			SET(LMMS_HAVE_WEAKJACK TRUE)
-			SET(WEAKJACK_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/3rdparty/weakjack/weakjack)
+		SET(STATUS_JACK "OK")
+		SET(LMMS_HAVE_JACK TRUE)
+	ELSE()
+		SET(JACK_INCLUDE_DIRS "")
+		SET(STATUS_JACK "not found, please install libjack0.100.0-dev (or similar) "
+			"if you require JACK support or enable weak jack")
+	ENDIF()
+	IF(WANT_WEAKJACK)
+		SET(WEAKJACK_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/3rdparty/weakjack/weakjack)
+
+		# We only need Jack's header files, so finding the host's headers in the case
+		# of cross-compiling is fine.
+		find_path(JACK_INCLUDE_DIR NAMES jack/jack.h PATHS /usr/include ${JACK_INCLUDE_DIRS} CMAKE_FIND_ROOT_PATH_BOTH)
+		IF(JACK_INCLUDE_DIR)
 			SET(STATUS_JACK "OK (weak linking enabled)")
 			# use dlsym instead
 			SET(JACK_LIBRARIES ${CMAKE_DL_LIBS})
+			SET(LMMS_HAVE_JACK TRUE)
+			SET(LMMS_HAVE_WEAKJACK TRUE)
+
+			IF(NOT CMAKE_CROSSCOMPILING)
+				SET(JACK_INCLUDE_DIRS "${JACK_INCLUDE_DIR}")
+			ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+				# We're cross-compiling but possibly using the host's jack
+				# library, so we need to use "-idirafter" to avoid conflicts
+				# between the host's and the target's header files. -idirafter
+				# will make sure that ${JACK_INCLUDE_DIR} is only considered for
+				# #include instructions after all other search directories have
+				# been exhausted. With normal "-I", we end up including the
+				# host's standard library header files, leading to confusing
+				# compilation errors due to conflicting declarations.
+				set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${JACK_INCLUDE_DIR}")
+				set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -idirafter ${JACK_INCLUDE_DIR}")
+			ELSE()
+				SET(STATUS_JACK "Host's jack headers were found, but you're using an unknown cross-compiler. Try to use MinGW or supply a jack library for the target architecture at ${CMAKE_FIND_ROOT_PATHS}")
+				SET(LMMS_HAVE_JACK FALSE)
+				SET(LMMS_HAVE_WEAKJACK FALSE)
+			ENDIF()
 		ELSE()
-			SET(STATUS_JACK "OK")
+			SET(STATUS_JACK "no jack headers found, please install libjack0.100.0-dev (or similar) ")
+			SET(LMMS_HAVE_JACK)
 		ENDIF()
-		SET(LMMS_HAVE_JACK TRUE)
-	ELSE(JACK_FOUND)
-		SET(JACK_INCLUDE_DIRS "")
-		SET(STATUS_JACK "not found, please install libjack0.100.0-dev (or similar) "
-			"if you require JACK support")
-	ENDIF(JACK_FOUND)
+	ENDIF()
 ENDIF(WANT_JACK)
 
 # check for FFTW3F-library

cmake/nsis/CMakeLists.txt

@@ -21,8 +21,7 @@ SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS   "
   \\\${registerExtension} \\\"$INSTDIR\\\\${CMAKE_PROJECT_NAME}.exe\\\" \\\".mmpz\\\" \\\"${PROJECT_NAME_UCASE} Project (compressed)\\\"
   \\\${IfNot} \\\${AtMostWin7}
     WriteRegDWORD HKLM \\\"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\SideBySide\\\" \\\"PreferExternalManifest\\\" \\\"1\\\"
-  \\\${EndIf}
-  " PARENT_SCOPE)
+  \\\${EndIf}")
 SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
   \\\${unregisterExtension} \\\".mmp\\\" \\\"${PROJECT_NAME_UCASE} Project\\\"
   \\\${unregisterExtension} \\\".mmpz\\\" \\\"${PROJECT_NAME_UCASE} Project (compressed)\\\"
@@ -74,6 +73,27 @@ IF(LMMS_HAVE_STK)
 	INSTALL(FILES ${RAWWAVES} DESTINATION "${DATA_DIR}/stk/rawwaves")
 ENDIF()
 
+# Bundle jack
+IF(LMMS_BUILD_WIN32 AND WANT_JACK)
+	SET(JACK_INSTALLER_TAG "1.9.11")
+	SET(JACK_INSTALLER_FILENAME "Jack_v1.9.11_32_setup.exe")
+	IF(LMMS_BUILD_WIN64)
+		SET(JACK_INSTALLER_FILENAME "Jack_v1.9.11_64_setup.exe")
+	ENDIF()
+
+	INSTALL(CODE
+		"FILE(DOWNLOAD
+		\"https://github.com/jackaudio/jackaudio.github.com/releases/download/${JACK_INSTALLER_TAG}/${JACK_INSTALLER_FILENAME}\"
+		\"${CMAKE_BINARY_DIR}/${JACK_INSTALLER_FILENAME}\"
+		)"
+	)
+	INSTALL(FILES "${CMAKE_BINARY_DIR}/${JACK_INSTALLER_FILENAME}" DESTINATION .)
+	SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}
+  ExecWait '\\\"$INSTDIR\\\\${JACK_INSTALLER_FILENAME}\\\" /install'")
+ENDIF()
+
+SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE)
+
 INSTALL(FILES "lmms.exe.manifest" DESTINATION .)
 INSTALL(FILES "lmms.VisualElementsManifest.xml" DESTINATION .)
 INSTALL(DIRECTORY "assets" DESTINATION .)

data/themes/default/style.css

@@ -646,6 +646,7 @@ TrackContentObjectView   {
 	qproperty-textColor: #fff;
 	qproperty-textBackgroundColor: rgba(0, 0, 0, 75);
 	qproperty-textShadowColor: rgba(0,0,0,200);
+ 	qproperty-recordingBackgroundColor: rgba(139,25,25,0.38);
 	qproperty-gradient: false; /* boolean property, set true to have a gradient */
 
 	font-size: 11px;

include/AudioJack.h

@@ -38,6 +38,8 @@
 #include <QtCore/QList>
 #include <QtCore/QMap>
 
+#include <memory>
+
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"
 
@@ -102,6 +104,9 @@ private slots:
 							void * _udata );
 	static void shutdownCallback( void * _udata );
 
+	void connectJackPort	(const char *outputPort,
+							 const char *inputPort,
+							 const char *portName);
 
 	jack_client_t * m_client;
 
@@ -110,7 +115,10 @@ private slots:
 
 	MidiJack *m_midiClient;
 	QVector<jack_port_t *> m_outputPorts;
+	QVector<jack_port_t *> m_inputPorts;
 	jack_default_audio_sample_t * * m_tempOutBufs;
+	jack_default_audio_sample_t * * m_tempInBufs;
+	std::vector<sampleFrame> m_inBuffer;
 	surroundSampleFrame * m_outBuf;
 
 	f_cnt_t m_framesDoneInCurBuf;

include/AudioPulseAudio.h

@@ -72,12 +72,16 @@ class AudioPulseAudio : public QThread, public AudioDevice
 
 
 	void streamWriteCallback( pa_stream * s, size_t length );
+	void streamReadCallback(pa_stream *s, size_t length);
 
 	void signalConnected( bool connected );
 
 	pa_stream * m_s;
 	pa_sample_spec m_sampleSpec;
 
+	pa_stream * m_recordStream;
+	pa_sample_spec m_recordSampleSpec;
+
 
 private:
 	virtual void startProcessing();
@@ -87,8 +91,6 @@ class AudioPulseAudio : public QThread, public AudioDevice
 
 	volatile bool m_quit;
 
-	bool m_convertEndian;
-
 	bool m_connected;
 	QSemaphore m_connectedSemaphore;
 

include/AutomationTrack.h

@@ -46,7 +46,7 @@ class AutomationTrack : public Track
 	}
 
 	virtual TrackView * createView( TrackContainerView* );
-	virtual TrackContentObject * createTCO( const MidiTime & _pos );
+	virtual TrackContentObject * unsafeCreateTCO( const MidiTime & _pos );
 
 	virtual void saveTrackSpecificSettings( QDomDocument & _doc,
 							QDomElement & _parent );
@@ -61,13 +61,19 @@ class AutomationTrack : public Track
 
 class AutomationTrackView : public TrackView
 {
+	Q_OBJECT
 public:
 	AutomationTrackView( AutomationTrack* at, TrackContainerView* tcv );
 	virtual ~AutomationTrackView() = default;
 
 	virtual void dragEnterEvent( QDragEnterEvent * _dee );
 	virtual void dropEvent( QDropEvent * _de );
 
+	virtual void updateTrackOperationsWidgetMenu (TrackOperationsWidget *trackOperations) override;
+
+public slots:
+	void recordingOn();
+	void recordingOff();
 } ;
 
 

include/BBTrack.h

@@ -135,7 +135,7 @@ class LMMS_EXPORT BBTrack : public Track
 	virtual bool play( const MidiTime & _start, const fpp_t _frames,
 						const f_cnt_t _frame_base, int _tco_num = -1 );
 	virtual TrackView * createView( TrackContainerView* tcv );
-	virtual TrackContentObject * createTCO( const MidiTime & _pos );
+	virtual TrackContentObject * unsafeCreateTCO(const MidiTime &_pos);
 
 	virtual void saveTrackSpecificSettings( QDomDocument & _doc,
 							QDomElement & _parent );

include/Engine.h

@@ -31,6 +31,7 @@
 
 
 #include "lmms_export.h"
+#include "lmms_basics.h"
 
 class BBTrackContainer;
 class DummyTrackContainer;
@@ -100,6 +101,9 @@ class LMMS_EXPORT LmmsCore : public QObject
 	{
 		return s_framesPerTick;
 	}
+
+	static float framesPerTick (sample_rate_t sample_rate);
+
 	static void updateFramesPerTick();
 
 	static inline LmmsCore * inst()

include/EnvelopeAndLfoParameters.h

@@ -163,6 +163,7 @@ public slots:
 	sample_t m_random;
 	bool m_bad_lfoShapeData;
 	SampleBuffer m_userWave;
+	SampleBuffer::InfoUpdatingValue m_userWaveInfo;
 
 	enum LfoShapes
 	{

include/InstrumentTrack.h

@@ -136,7 +136,7 @@ class LMMS_EXPORT InstrumentTrack : public Track, public MidiEventProcessor
 	virtual TrackView * createView( TrackContainerView* tcv );
 
 	// create new track-content-object = pattern
-	virtual TrackContentObject * createTCO( const MidiTime & _pos );
+	virtual TrackContentObject * unsafeCreateTCO(const MidiTime &_pos) override ;
 
 
 	// called by track
@@ -319,6 +319,8 @@ class InstrumentTrackView : public TrackView
 	QMenu * createFxMenu( QString title, QString newFxLabel );
 
 
+	virtual void updateTrackOperationsWidgetMenu (TrackOperationsWidget *trackOperations) override;
+
 protected:
 	virtual void dragEnterEvent( QDragEnterEvent * _dee );
 	virtual void dropEvent( QDropEvent * _de );