Enable sample track recording

include/AudioJack.h

@@ -39,6 +39,8 @@
 #include <QtCore/QMap>
 #include <QMutexLocker>
 
+#include <memory>
+
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"
 
@@ -112,7 +114,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::unique_ptr<sampleFrame[]> m_inBuffer;
 	surroundSampleFrame * m_outBuf;
 
 	f_cnt_t m_framesDoneInCurBuf;

include/AudioPulseAudio.h

@@ -71,12 +71,16 @@ class AudioPulseAudio : public AudioDevice, public QThread
 
 
 	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();
@@ -86,8 +90,6 @@ class AudioPulseAudio : public AudioDevice, public QThread
 
 	volatile bool m_quit;
 
-	bool m_convertEndian;
-
 	bool m_connected;
 	QSemaphore m_connectedSemaphore;
 

include/AudioSdl.h

@@ -78,17 +78,35 @@ class AudioSdl : public AudioDevice
 	static void sdlAudioCallback( void * _udata, Uint8 * _buf, int _len );
 	void sdlAudioCallback( Uint8 * _buf, int _len );
 
+#ifdef LMMS_HAVE_SDL2
+	static void sdlInputAudioCallback( void * _udata, Uint8 * _buf, int _len );
+	void sdlInputAudioCallback( Uint8 * _buf, int _len );
+#endif
+
 	SDL_AudioSpec m_audioHandle;
 
 	surroundSampleFrame * m_outBuf;
+
+#ifdef LMMS_HAVE_SDL2
+	uint64_t m_currentBufferFramePos;
+	uint64_t m_currentBufferFramesCount;
+#else
 	Uint8 * m_convertedBuf;
 	int m_convertedBufPos;
 	int m_convertedBufSize;
+	bool m_outConvertEndian;
+#endif
 
-	bool m_convertEndian;
 
 	bool m_stopped;
 
+#ifdef LMMS_HAVE_SDL2
+	SDL_AudioDeviceID m_outputDevice;
+
+	SDL_AudioSpec m_inputAudioHandle;
+	SDL_AudioDeviceID m_inputDevice;
+#endif
+
 } ;
 
 #endif

include/AutomationTrack.h

@@ -61,13 +61,19 @@ class AutomationTrack : public Track
 
 class AutomationTrackView : public TrackView
 {
+	Q_OBJECT
 public:
 	AutomationTrackView( AutomationTrack* at, TrackContainerView* tcv );
 	virtual ~AutomationTrackView();
 
 	virtual void dragEnterEvent( QDragEnterEvent * _dee );
 	virtual void dropEvent( QDropEvent * _de );
 
+	virtual void updateTrackOperationsWidgetMenu (TrackOperationsWidget *trackOperations) override;
+
+public slots:
+	void recordingOn();
+	void recordingOff();
 } ;
 
 

include/Engine.h

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

include/InstrumentTrack.h

@@ -315,6 +315,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 );

include/Mixer.h

@@ -282,7 +282,7 @@ class EXPORT Mixer : public QObject
 		return m_fifoWriter != NULL;
 	}
 
-	void pushInputFrames( sampleFrame * _ab, const f_cnt_t _frames );
+	void pushInputFrames(const sampleFrame *_ab, const f_cnt_t _frames , bool shouldApplyMasterGain=false);
 
 	inline const sampleFrame * inputBuffer()
 	{
@@ -304,6 +304,9 @@ class EXPORT Mixer : public QObject
 	inline bool isMetronomeActive() const { return m_metronomeActive; }
 	inline void setMetronomeActive(bool value = true) { m_metronomeActive = value; }
 
+	void applyMasterGainToInputBuffer (sampleFrame	*frames_data,
+								  const size_t frames_count, uint channels_count, float gain);
+
 	void requestChangeInModel();
 	void doneChangeInModel();
 

include/SampleRecordHandle.h

@@ -31,6 +31,8 @@
 
 #include "MidiTime.h"
 #include "PlayHandle.h"
+#include "SampleTrack.h"
+
 
 class BBTrack;
 class SampleBuffer;
@@ -41,7 +43,7 @@ class Track;
 class SampleRecordHandle : public PlayHandle
 {
 public:
-	SampleRecordHandle( SampleTCO* tco );
+	SampleRecordHandle( SampleTCO* tco , MidiTime startRecordTimeOffset);
 	virtual ~SampleRecordHandle();
 
 	virtual void play( sampleFrame * _working_buffer );
@@ -54,6 +56,17 @@ class SampleRecordHandle : public PlayHandle
 
 
 private:
+	void copyBufferFromMonoLeft( const sampleFrame * inputBuffer,
+								 sampleFrame *outputBuffer,
+								 const f_cnt_t _frames);
+	void copyBufferFromMonoRight( const sampleFrame * inputBuffer,
+								  sampleFrame *outputBuffer,
+								  const f_cnt_t _frames);
+	void copyBufferFromStereo( const sampleFrame * inputBuffer,
+							   sampleFrame *outputBuffer,
+							   const f_cnt_t _frames);
+
+
 	virtual void writeBuffer( const sampleFrame * _ab,
 						const f_cnt_t _frames );
 
@@ -66,6 +79,13 @@ class SampleRecordHandle : public PlayHandle
 	BBTrack * m_bbTrack;
 	SampleTCO * m_tco;
 
+	// The recording type as it was when we started
+	// recording.
+	SampleTrack::RecordingChannel m_recordingChannel;
+
+	// The offset from the start of m_track that the record has
+	// started from.
+	MidiTime m_startRecordTimeOffset;
 } ;
 
 

include/SampleTrack.h

@@ -67,6 +67,11 @@ class SampleTCO : public TrackContentObject
 	bool isPlaying() const;
 	void setIsPlaying(bool isPlaying);
 
+	/**
+	 * @brief isEmpty  Check if this TCO has not content.
+	 */
+	bool isEmpty() const;
+
 public slots:
 	void setSampleBuffer( SampleBuffer* sb );
 	void setSampleFile( const QString & _sf );
@@ -127,7 +132,15 @@ public slots:
 class SampleTrack : public Track
 {
 	Q_OBJECT
+	mapPropertyFromModel(bool,isRecord,setRecord,m_recordModel);
 public:
+	enum RecordingChannel : int {
+		None,
+		MonoRight,
+		MonoLeft,
+		Stereo,
+	};
+
 	SampleTrack( TrackContainer* tc );
 	virtual ~SampleTrack();
 
@@ -151,11 +164,19 @@ class SampleTrack : public Track
 		return "sampletrack";
 	}
 
+	RecordingChannel recordingChannel() const;
+	void setRecordingChannel(const RecordingChannel &recordingChannel);
+
 public slots:
 	void updateTcos();
 	void setPlayingTcos( bool isPlaying );
+	void beforeRecord ();
+	void toggleRecord();
 
 private:
+	IntModel m_recordingChannelModel;
+
+	BoolModel m_recordModel;
 	FloatModel m_volumeModel;
 	FloatModel m_panningModel;
 	AudioPort m_audioPort;
@@ -176,6 +197,8 @@ class SampleTrackView : public TrackView
 	virtual ~SampleTrackView();
 
 
+	virtual void updateTrackOperationsWidgetMenu (TrackOperationsWidget *trackOperations) override;
+
 public slots:
 	void showEffects();
 
@@ -188,7 +211,11 @@ public slots:
 	}
 
 
+private slots:
+	void onRecordActionSelected (QAction *action);
+
 private:
+	QAction *m_toggleRecordAction;
 	EffectRackView * m_effectRack;
 	QWidget * m_effWindow;
 	Knob * m_volumeKnob;

include/Song.h

@@ -323,6 +323,8 @@ public slots:
 
 	void addBBTrack();
 
+signals:
+	void beforeRecord ();
 
 private slots:
 	void insertBar();

include/SongEditor.h

@@ -32,6 +32,7 @@
 #include "ActionGroup.h"
 #include "Editor.h"
 #include "TrackContainerView.h"
+#include "SampleTrack.h"
 
 class QLabel;
 class QScrollBar;
@@ -156,6 +157,8 @@ class SongEditorWindow : public Editor
 
 	SongEditor* m_editor;
 
+	SampleTrack::RecordingChannel globalRecordChannel() const;
+
 protected:
 	virtual void resizeEvent( QResizeEvent * event );
 
@@ -168,6 +171,8 @@ protected slots:
 	void lostFocus();
 	void adjustUiAfterProjectLoad();
 
+	void onRecordChannelSelected(QAction *action);
+
 signals:
 	void playTriggered();
 	void resized();
@@ -186,6 +191,8 @@ protected slots:
 	QAction* m_crtlAction;
 
 	ComboBox * m_zoomingComboBox;
+
+	SampleTrack::RecordingChannel m_globalRecordChannel = SampleTrack::RecordingChannel::Stereo;
 };
 
 #endif

include/Track.h

@@ -429,6 +429,8 @@ class TrackOperationsWidget : public QWidget
 	~TrackOperationsWidget();
 
 
+	QPushButton *trackOps() const;
+
 protected:
 	virtual void mousePressEvent( QMouseEvent * me );
 	virtual void paintEvent( QPaintEvent * pe );
@@ -438,8 +440,6 @@ private slots:
 	void cloneTrack();
 	void removeTrack();
 	void updateMenu();
-	void recordingOn();
-	void recordingOff();
 	void clearTrack();
 
 private:
@@ -676,6 +676,8 @@ class TrackView : public QWidget, public ModelView, public JournallingObject
 
 	virtual void update();
 
+	virtual void updateTrackOperationsWidgetMenu (TrackOperationsWidget *trackOperations);
+
 
 public slots:
 	virtual bool close();

include/lmms_basics.h

@@ -121,6 +121,9 @@ const ch_cnt_t SURROUND_CHANNELS =
 				2;
 #endif
 
+// "In audio 1 is always the left" - umcaruje, 2017
+const ch_cnt_t RIGHT_CHANNEL_INDEX = 1;
+const ch_cnt_t LEFT_CHANNEL_INDEX  = 0;
 
 #ifdef LMMS_BUILD_WIN32
 #define LADSPA_PATH_SEPERATOR ';'

src/core/Engine.cpp

@@ -103,6 +103,11 @@ void LmmsCore::destroy()
 	delete ConfigManager::inst();
 }
 
+float LmmsCore::framesPerTick(sample_rate_t sample_rate)  {
+	return sample_rate * 60.0f * 4 /
+			DefaultTicksPerTact / s_song->getTempo();
+}
+