hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

More prominent recording option

Browse Source 
Make the option to record samples more prominent by providing a pixmap
button that is always shown and that can be used to turn recording on or
off. The corresponding widget which constitutes of the button and a label
is always positioned at the bottom left of the sample clip.

Technical details
------------------
The recording widget is built in the private method `buildRecordWidget`.
The method `adjustRecordWidget` is used to move the recording widget to
the correct position relative to the sample view. It is called after
construction and whenever the sample clip is resized (see `resizeEvent`).

Add the method `SampleClip::getRecordModel` so that the pixmap button can
be configured to act on it.
This commit is contained in:
Michael Gregorius
2024-06-02 12:34:59 +02:00
parent f9ea9705b8
commit 48c4dce96f
3 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/SampleClip.h
View File

@@ -81,6 +81,8 @@ public:
void setIsPlaying(bool isPlaying);
void setSampleBuffer(std::shared_ptr<const SampleBuffer> sb);
BoolModel& getRecordModel() { return m_recordModel; }
public slots:
void setSampleFile(const QString& sf);
void updateLength();

9
include/SampleClipView.h
View File

@@ -27,10 +27,13 @@
#include "ClipView.h"
class QWidget;
namespace lmms
{
class SampleClip;
class BoolModel;
namespace gui
{
@@ -59,12 +62,18 @@ protected:
void dropEvent( QDropEvent * _de ) override;
void mouseDoubleClickEvent( QMouseEvent * ) override;
void paintEvent( QPaintEvent * ) override;
void resizeEvent(QResizeEvent *event) override;
private:
QWidget* buildRecordWidget(BoolModel& recordModel);
void adjustRecordWidget();
private:
SampleClip * m_clip;
QPixmap m_paintPixmap;
bool splitClip( const TimePos pos ) override;
QWidget* m_recordWidget;
} ;

71
src/gui/clips/SampleClipView.cpp
View File

@@ -25,6 +25,8 @@
#include "SampleClipView.h"
#include <QApplication>
#include <QHBoxLayout>
#include <QLabel>
#include <QMenu>
#include <QPainter>
@@ -33,6 +35,7 @@
#include "embed.h"
#include "gui_templates.h"
#include "PathUtil.h"
#include "PixmapButton.h"
#include "SampleClip.h"
#include "SampleLoader.h"
#include "SampleWaveform.h"
@@ -57,6 +60,11 @@ SampleClipView::SampleClipView( SampleClip * _clip, TrackView * _tv ) :
connect(m_clip, SIGNAL(wasReversed()), this, SLOT(update()));
setStyle( QApplication::style() );
m_recordWidget = buildRecordWidget(_clip->getRecordModel());
m_recordWidget->setVisible(true);
adjustRecordWidget();
}
void SampleClipView::updateSample()
@@ -306,36 +314,6 @@ void SampleClipView::paintEvent( QPaintEvent * pe )
{
p.drawLine(m_markerPos, rect().bottom(), m_markerPos, rect().top());
}
// recording sample tracks is not possible at the moment
if (m_clip->isRecord())
{
p.setFont(adjustedToPixelSize(p.font(), 10));
const auto fontHeight = p.fontMetrics().height();
const auto baseLine = height() - 3;
const int recordSymbolRadius = 3;
const int recordSymbolCenterX = recordSymbolRadius + 4;
const int recordSymbolCenterY = baseLine - fontHeight / 2 + 1;
const int textStartX = recordSymbolCenterX + recordSymbolRadius + 4;
auto textPos = QPoint(textStartX, baseLine);
const auto rec = tr("Rec");
p.setPen(textShadowColor());
p.drawText(textPos + QPoint(1, 1), rec);
p.setPen(textColor());
p.drawText(textPos, rec);
p.setBrush(QBrush(textColor()));
p.drawEllipse(QPoint(recordSymbolCenterX, recordSymbolCenterY), recordSymbolRadius, recordSymbolRadius);
}
p.end();
@@ -343,6 +321,12 @@ void SampleClipView::paintEvent( QPaintEvent * pe )
}
void SampleClipView::resizeEvent(QResizeEvent *event)
{
adjustRecordWidget();
ClipView::resizeEvent(event);
}
void SampleClipView::reverseSample()
@@ -393,5 +377,32 @@ bool SampleClipView::splitClip( const TimePos pos )
else { return false; }
}
QWidget* SampleClipView::buildRecordWidget(BoolModel& recordModel)
{
auto recordWidget = new QWidget(this);
auto recordButton = new PixmapButton(recordWidget);
recordButton->setActiveGraphic(embed::getIconPixmap("led_red"));
recordButton->setToolTip(tr("Enable/disable recording"));
recordButton->setCheckable(true);
recordButton->setModel(&recordModel);
auto recordLabel = new QLabel(tr("Rec"), recordWidget);
recordLabel->setFont(adjustedToPixelSize(recordLabel->font(), 10));
// Now layout everything
QHBoxLayout* recordLayout = new QHBoxLayout(recordWidget);
recordLayout->setContentsMargins(0, 0, 0, 0);
recordLayout->addWidget(recordButton);
recordLayout->addWidget(recordLabel);
return recordWidget;
}
void SampleClipView::adjustRecordWidget()
{
m_recordWidget->move(1, height() - m_recordWidget->height() - 1);
}
} // namespace lmms::gui