Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-19 14:43:30 +02:00
Code Issues Projects Releases Wiki Activity

2021-03-11 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added a 'RDWaveFactory' class.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-03-11 14:44:40 -05:00
parent 066be2b9e8
commit f2b8f6ddba
16 changed files with 587 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -138,6 +138,7 @@ tests/test_pam
tests/timer_test
tests/upload_test
tests/wav_chunk_test
tests/wavefactory_test
tests/wavescene_test
tests/wavewidget_test
utils/rdauth/rdauth

2
ChangeLog
View File

@ -21262,3 +21262,5 @@
* Stubbed out a 'RDWaveScene' class.
2021-03-11 Fred Gleason <fredg@paravelsystems.com>
* Added a 'RDWaveWidget' class.
2021-03-11 Fred Gleason <fredg@paravelsystems.com>
* Added a 'RDWaveFactory' class.

1
lib/Makefile.am
View File

@ -276,6 +276,7 @@ dist_librd_la_SOURCES = dbversion.h\
rdversion.cpp rdversion.h\
rdwavedata.cpp rdwavedata.h\
rdwavedata_dialog.cpp rdwavedata_dialog.h\
rdwavefactory.cpp rdwavefactory.h\
rdwavefile.cpp rdwavefile.h\
rdwavescene.cpp rdwavescene.h\
rdwavepainter.cpp rdwavepainter.h\

2
lib/lib.pro
View File

@ -203,6 +203,7 @@ SOURCES += rduser.cpp
SOURCES += rduserlistmodel.cpp
SOURCES += rdversion.cpp
SOURCES += rdwavedata.cpp
SOURCES += rdwavefactory.cpp
SOURCES += rdwavefile.cpp
SOURCES += rdwavescene.cpp
SOURCES += rdwavewidget.cpp
@ -382,6 +383,7 @@ HEADERS += rduser.h
HEADERS += rduserlistmodel.h
HEADERS += rdversion.h
HEADERS += rdwavedata.h
HEADERS += rdwavefactory.h
HEADERS += rdwavescene.h
HEADERS += rdwavewidget.h
HEADERS += rdweb.h

8
lib/librd_cs.ts
View File

@ -921,6 +921,14 @@
<source>Output</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No such cart/cut!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Energy export failed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

8
lib/librd_de.ts
View File

@ -917,6 +917,14 @@
<source>Output</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No such cart/cut!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Energy export failed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

8
lib/librd_es.ts
View File

@ -917,6 +917,14 @@
<source>Output</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No such cart/cut!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Energy export failed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

8
lib/librd_fr.ts
View File

@ -887,6 +887,14 @@
<source>Output</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No such cart/cut!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Energy export failed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

8
lib/librd_nb.ts
View File

@ -917,6 +917,14 @@
<source>Output</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No such cart/cut!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Energy export failed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

8
lib/librd_nn.ts
View File

@ -917,6 +917,14 @@
<source>Output</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No such cart/cut!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Energy export failed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

8
lib/librd_pt_BR.ts
View File

@ -917,6 +917,14 @@
<source>Output</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No such cart/cut!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Energy export failed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

158
lib/rdwavefactory.cpp Normal file
View File

@ -0,0 +1,158 @@
// rdwavefactory.cpp
//
// Factory for generating audio waveform pixmaps
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <QObject>
#include <QPainter>
#include "rdapplication.h"
#include "rdcut.h"
#include "rdpeaksexport.h"
#include "rdwavefactory.h"
RDWaveFactory::RDWaveFactory(RDWaveFactory::TrackMode mode)
{
d_track_mode=mode;
d_cart_number=0;
d_cut_number=-1;
}
RDWaveFactory::TrackMode RDWaveFactory::trackMode() const
{
return d_track_mode;
}
unsigned RDWaveFactory::cartNumber() const
{
return d_cart_number;
}
int RDWaveFactory::cutNumber() const
{
return d_cut_number;
}
QPixmap RDWaveFactory::generate(int height,int x_shrink,int gain)
{
QPixmap pix(d_energy.size()/(x_shrink*d_energy_channels),height);
pix.fill(Qt::white); // FIXME: make the background transparent
QPainter *p=new QPainter(&pix);
p->setPen(Qt::black);
//
// Gain Ratio
//
double ratio=exp10((double)gain/2000.0);
//
// Waveform
//
for(unsigned i=0;i<d_energy_channels;i++) {
int zero_line=height/(d_energy_channels*2)+i*height/(d_energy_channels);
p->drawLine(0,zero_line,d_energy.size()/x_shrink,zero_line);
for(int j=i;j<d_energy.size();j+=(d_energy_channels*x_shrink)) {
uint16_t lvl=d_energy.at(j);
for(int k=1;k<x_shrink;k++) {
if(((j+k)<d_energy.size())&&(d_energy.at(j+k))>lvl) {
lvl=d_energy.at(j+k);
}
}
int rlvl=(int)(ratio*(double)lvl*(double)height/
(65534.0*(double)d_energy_channels));
// Bottom half
p->fillRect(j/(x_shrink*d_energy_channels),zero_line,1,rlvl,Qt::black);
// Top half
p->fillRect(j/(x_shrink*d_energy_channels),zero_line,1,-rlvl,Qt::black);
}
}
//
// Dividing Line
//
p->setPen(Qt::gray);
for(unsigned i=1;i<d_energy_channels;i++) {
p->drawLine(0,i*height/d_energy_channels,
d_energy.size()/x_shrink,i*height/d_energy_channels);
}
p->end();
delete p;
return pix;
}
bool RDWaveFactory::setCut(QString *err_msg,unsigned cartnum,int cutnum)
{
d_energy.clear();
d_cart_number=cartnum;
d_cut_number=cutnum;
//
// Get Cut Info
//
RDCut *cut=new RDCut(cartnum,cutnum);
if(!cut->exists()) {
*err_msg=QObject::tr("No such cart/cut!");
delete cut;
return false;
}
d_channels=cut->channels();
delete cut;
d_energy_channels=d_channels;
if(d_track_mode==RDWaveFactory::SingleTrack) {
d_energy_channels=1;
}
//
// Get Cut Energy Data
//
RDPeaksExport::ErrorCode err_code;
RDPeaksExport *conv=new RDPeaksExport();
conv->setCartNumber(cartnum);
conv->setCutNumber(cutnum);
if((err_code=conv->runExport(rda->user()->name(),rda->user()->password()))!=
RDPeaksExport::ErrorOk) {
*err_msg=QObject::tr("Energy export failed")+": "+
RDPeaksExport::errorText(err_code);
delete conv;
return false;
}
if((d_track_mode==RDWaveFactory::SingleTrack)&&(d_channels==2)) { // Mix-down
for(unsigned i=0;i<conv->energySize();i+=2) {
uint32_t frame=
((uint32_t)conv->energy(i)+(uint32_t)conv->energy(i+1))/2;
d_energy.push_back(frame);
}
}
else { // Pass-through
for(unsigned i=0;i<conv->energySize();i++) {
d_energy.push_back(conv->energy(i));
}
}
delete conv;
return true;
}

48
lib/rdwavefactory.h Normal file
View File

@ -0,0 +1,48 @@
// rdwavefactory.h
//
// Factory for generating audio waveform pixmaps
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#ifndef RDWAVEFACTORY_H
#define RDWAVEFACTORY_H
#include <QList>
#include <QPixmap>
class RDWaveFactory
{
public:
enum TrackMode {SingleTrack=0,MultiTrack=1};
RDWaveFactory(TrackMode mode);
TrackMode trackMode() const;
unsigned cartNumber() const;
int cutNumber() const;
QPixmap generate(int height,int x_shrink,int gain);
bool setCut(QString *err_msg,unsigned cartnum,int cutnum);
private:
TrackMode d_track_mode;
unsigned d_cart_number;
int d_cut_number;
QList<uint16_t> d_energy;
unsigned d_channels;
unsigned d_energy_channels;
};
#endif // RDWAVEFACTORY_H

5
tests/Makefile.am
View File

@ -53,6 +53,7 @@ noinst_PROGRAMS = audio_convert_test\
timer_test\
upload_test\
wav_chunk_test\
wavefactory_test\
wavescene_test\
wavewidget_test
@ -142,6 +143,10 @@ upload_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@
dist_wav_chunk_test_SOURCES = wav_chunk_test.cpp wav_chunk_test.h
wav_chunk_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@
dist_wavefactory_test_SOURCES = wavefactory_test.cpp wavefactory_test.h
nodist_wavefactory_test_SOURCES = moc_wavefactory_test.cpp
wavefactory_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@
dist_wavescene_test_SOURCES = wavescene_test.cpp wavescene_test.h
nodist_wavescene_test_SOURCES = moc_wavescene_test.cpp
wavescene_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@

242
tests/wavefactory_test.cpp Normal file
View File

@ -0,0 +1,242 @@
// wavefactory_test.cpp
//
// Test harness for RDWavefactory
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <QApplication>
#include <QGraphicsTextItem>
#include <QMessageBox>
#include <rdapplication.h>
#include <rdpeaksexport.h>
#include "wavefactory_test.h"
MainWidget::MainWidget(QWidget *parent)
: QWidget(parent)
{
QString err_msg;
bool ok=false;
d_cart_number=0;
d_cut_number=-1;
d_scene=NULL;
bool track_mode_set=false;
//
// Open the database
//
rda=new RDApplication("wavefactory_test","wavefactory_test",WAVEFACTORY_TEST_USAGE,
this);
if(!rda->open(&err_msg)) {
QMessageBox::critical(this,"wavefactory_test - "+tr("Error"),err_msg);
exit(RDApplication::ExitNoDb);
}
d_font_engine=new RDFontEngine(font(),rda->config());
//
// Get Command Switches
//
for(unsigned i=0;i<rda->cmdSwitch()->keys();i++) {
if(rda->cmdSwitch()->key(i)=="--cart-number") {
d_cart_number=rda->cmdSwitch()->value(i).toUInt(&ok);
if((!ok)||(d_cart_number>RD_MAX_CART_NUMBER)) {
fprintf(stderr,"wavefactory_test: invalid cart number\n");
exit(RDApplication::ExitInvalidOption);
}
rda->cmdSwitch()->setProcessed(i,true);
}
if(rda->cmdSwitch()->key(i)=="--cut-number") {
d_cut_number=rda->cmdSwitch()->value(i).toInt(&ok);
if((!ok)||(d_cut_number>RD_MAX_CUT_NUMBER)||(d_cut_number<1)) {
fprintf(stderr,"wavefactory_test: invalid cut number\n");
exit(RDApplication::ExitInvalidOption);
}
rda->cmdSwitch()->setProcessed(i,true);
}
if(rda->cmdSwitch()->key(i)=="--track-mode") {
if(rda->cmdSwitch()->value(i)=="single") {
d_track_mode=RDWaveFactory::SingleTrack;
track_mode_set=true;
}
if(rda->cmdSwitch()->value(i)=="multi") {
d_track_mode=RDWaveFactory::MultiTrack;
track_mode_set=true;
}
if(!track_mode_set) {
fprintf(stderr,"wavefactory_test: invalid --track-mode argument\n");
exit(RDApplication::ExitInvalidOption);
}
rda->cmdSwitch()->setProcessed(i,true);
}
if(!rda->cmdSwitch()->processed(i)) {
fprintf(stderr,"wavefactory_test: unknown option \"%s\"\"\n",
rda->cmdSwitch()->key(i).toUtf8().constData());
exit(RDApplication::ExitInvalidOption);
}
}
if(d_cart_number==0) {
fprintf(stderr,"wavefactory_test: you must specify a cart number\n");
exit(RDApplication::ExitInvalidOption);
}
if(d_cut_number==-1) {
fprintf(stderr,"wavefactory_test: you must specify a cut number\n");
exit(RDApplication::ExitInvalidOption);
}
if(!track_mode_set) {
fprintf(stderr,"wavefactory_test: you must specify a track mode\n");
exit(RDApplication::ExitInvalidOption);
}
//
// Wave Display
//
d_factory=new RDWaveFactory(d_track_mode);
d_view=new QGraphicsView(this);
//
// X Shrink Factor
//
d_shrink_factor_group=new QGroupBox(tr("X Shrink Factor"),this);
d_shrink_factor_group->setFont(d_font_engine->labelFont());
d_up_button=
new RDTransportButton(RDTransportButton::Up,d_shrink_factor_group);
connect(d_up_button,SIGNAL(clicked()),this,SLOT(upShrinkData()));
d_down_button=
new RDTransportButton(RDTransportButton::Down,d_shrink_factor_group);
connect(d_down_button,SIGNAL(clicked()),this,SLOT(downShrinkData()));
d_shrink_factor_edit=new QLineEdit(d_shrink_factor_group);
d_shrink_factor_edit->setReadOnly(true);
d_shrink_factor_edit->setText("1");
//
// Audio Gain
//
d_audio_gain_label=new QLabel(tr("Audio Gain")+":",this);
d_audio_gain_label->setFont(d_font_engine->labelFont());
d_audio_gain_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
d_audio_gain_spin=new QSpinBox(this);
d_audio_gain_spin->setRange(0,100);
d_audio_gain_unit=new QLabel(tr("dB")+":",this);
d_audio_gain_unit->setFont(d_font_engine->labelFont());
d_audio_gain_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
connect(d_audio_gain_spin,SIGNAL(valueChanged(int)),
this,SLOT(gainChangedData(int)));
//
// Connect to ripcd(8)
//
connect(rda,SIGNAL(userChanged()),this,SLOT(userData()));
rda->ripc()->
connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password());
setMinimumSize(sizeHint());
setMaximumHeight(sizeHint().height());
}
QSize MainWidget::sizeHint() const
{
return QSize(1000,375);
}
void MainWidget::userData()
{
QString err_msg;
setWindowTitle("wavefactory_test User: "+rda->user()->name());
if(!d_factory->setCut(&err_msg,d_cart_number,d_cut_number)) {
QMessageBox::critical(this,"wavefactory_test - "+tr("Error"),err_msg);
exit(RDApplication::ExitInvalidOption);
}
UpdateWave();
}
void MainWidget::upShrinkData()
{
int x_shrink=d_shrink_factor_edit->text().toInt();
x_shrink=x_shrink*2;
d_shrink_factor_edit->setText(QString().sprintf("%d",x_shrink));
UpdateWave();
}
void MainWidget::downShrinkData()
{
int x_shrink=d_shrink_factor_edit->text().toInt();
if(x_shrink>1) {
x_shrink=x_shrink/2;
d_shrink_factor_edit->setText(QString().sprintf("%d",x_shrink));
UpdateWave();
}
}
void MainWidget::gainChangedData(int db)
{
UpdateWave();
}
void MainWidget::resizeEvent(QResizeEvent *e)
{
int w=size().width();
int h=size().height();
d_view->setGeometry(0,0,w,20+d_view->sizeHint().height());
d_shrink_factor_group->setGeometry(10,h-150,155,145);
d_up_button->setGeometry(10,25,80,50);
d_down_button->setGeometry(10,80,80,50);
d_shrink_factor_edit->setGeometry(100,25,50,20);
d_audio_gain_label->setGeometry(200,h-120,100,20);
d_audio_gain_spin->setGeometry(305,h-120,50,20);
d_audio_gain_unit->setGeometry(360,h-120,50,20);
}
void MainWidget::UpdateWave()
{
QPixmap pix=d_factory->generate(200,d_shrink_factor_edit->text().toInt(),
100*d_audio_gain_spin->value());
if(d_scene!=NULL) {
d_scene->deleteLater();
}
d_scene=new QGraphicsScene(0,0,pix.width(),pix.height());
d_scene->addPixmap(pix);
d_view->setScene(d_scene);
d_view->setGeometry(0,0,size().width(),20+d_view->sizeHint().height());
}
int main(int argc,char *argv[])
{
QApplication a(argc,argv);
MainWidget *w=new MainWidget();
w->show();
return a.exec();
}

72
tests/wavefactory_test.h Normal file
View File

@ -0,0 +1,72 @@
// wavefactory_test.h
//
// Test harness for RDWaveFactory
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#ifndef WAVEFACTORY_TEST_H
#define WAVEFACTORY_TEST_H
#include <QGraphicsView>
#include <QGroupBox>
#include <QLabel>
#include <QLineEdit>
#include <QSpinBox>
#include <QWidget>
#include <rdfontengine.h>
#include <rdtransportbutton.h>
#include <rdwavefactory.h>
#define WAVEFACTORY_TEST_USAGE "--cart-number=<cartnum> --cut-number=<cutnum> --track-mode=single|multi\n"
class MainWidget : public QWidget
{
Q_OBJECT
public:
MainWidget(QWidget *parent=0);
QSize sizeHint() const;
private slots:
void userData();
void upShrinkData();
void downShrinkData();
void gainChangedData(int db);
protected:
void resizeEvent(QResizeEvent *e);
private:
void UpdateWave();
QGraphicsScene *d_scene;
QGraphicsView *d_view;
RDWaveFactory *d_factory;
unsigned d_cart_number;
int d_cut_number;
RDWaveFactory::TrackMode d_track_mode;
RDFontEngine *d_font_engine;
RDTransportButton *d_up_button;
RDTransportButton *d_down_button;
QLineEdit *d_shrink_factor_edit;
QGroupBox *d_shrink_factor_group;
QLabel *d_audio_gain_label;
QSpinBox *d_audio_gain_spin;
QLabel *d_audio_gain_unit;
};
#endif // WAVEFACTORY_TEST_H