Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-25 23:00:21 +01:00
Code Issues Projects Releases Wiki Activity

2014-10-09 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Implemented the 'RDXPORT_COMMAND_AUDIOSTORE' web API call in
	'web/rdxport/audiostore.cpp', 'web/rdxport/rdxport.cpp' and
	'web/rdxport/rdxport.h'.
	* Added an 'RDAudioStore' class in 'lib/rdaudiostore.cpp' and
	'lib/rdaudiostore.h'.
	* Modified the Desk Gauge widget in 'rdlibrary/disk_gauge.cpp'
	and 'rdlibrary/disk_gauge.h' to use the 'RDAudioStore' class
	[fixes GitHub issue #000035].
This commit is contained in:
Fred Gleason
2014-10-09 19:13:29 -04:00
parent 2982ee9b38
commit 5935d19ca6
14 changed files with 393 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
rdlibrary/disk_gauge.cpp
View File

@@ -22,12 +22,13 @@
#include <sys/vfs.h>
#include <qtimer.h>
#include <qfontmetrics.h>
#include <globals.h>
#include <rd.h>
#include <disk_gauge.h>
#include <rdconfig.h>
#include <rdaudiostore.h>
DiskGauge::DiskGauge(int samp_rate,int chans,QWidget *parent,const char *name)
: QWidget(parent,name)
@@ -41,27 +42,29 @@ DiskGauge::DiskGauge(int samp_rate,int chans,QWidget *parent,const char *name)
QFont label_font("Helvetica",12,QFont::Bold);
label_font.setPixelSize(12);
disk_label=new QLabel("Free:",this,"free_label");
disk_label=new QLabel("Free:",this);
disk_label->setGeometry(0,0,50,sizeHint().height());
disk_label->setFont(label_font);
disk_label->setAlignment(AlignRight|AlignVCenter);
disk_label->setDisabled(true);
disk_bar=new QProgressBar(this);
disk_bar->setPercentageVisible(false);
disk_bar->setGeometry(55,0,sizeHint().width()-55,sizeHint().height());
disk_bar->setDisabled(true);
disk_space_label=new QLabel(this);
disk_space_label->setFont(label_font);
disk_space_label->setAlignment(AlignCenter);
disk_space_label->setDisabled(true);
struct statfs diskstat;
statfs(RDConfiguration()->audioRoot().ascii(),&diskstat);
disk_bar->setTotalSteps(GetMinutes(diskstat.f_blocks,diskstat.f_bsize));
/*
update();
*/
QTimer *timer=new QTimer(this,"update_timer");
connect(timer,SIGNAL(timeout()),this,SLOT(update()));
timer->start(DISK_GAUGE_UPDATE_INTERVAL);
disk_timer=new QTimer(this);
connect(disk_timer,SIGNAL(timeout()),this,SLOT(update()));
disk_timer->start(100);
}
@@ -79,12 +82,28 @@ QSizePolicy DiskGauge::sizePolicy() const
void DiskGauge::update()
{
struct statfs diskstat;
statfs(RDConfiguration()->audioRoot().ascii() ,&diskstat);
int mins=GetMinutes(diskstat.f_bavail,diskstat.f_bsize);
disk_bar->setProgress(mins);
disk_space_label->
setText(QString().sprintf("%dh %02dm",mins/60,mins-60*(mins/60)));
if(lib_user==NULL) {
return;
}
RDAudioStore::ErrorCode conv_err;
RDAudioStore *conv=new RDAudioStore(rdstation_conf,lib_config,this);
if((conv_err=conv->runStore(lib_user->name(),lib_user->password()))==
RDAudioStore::ErrorOk) {
uint64_t free_min=conv->freeBytes()/
(60*rdlibrary_conf->defaultChannels()*lib_system->sampleRate());
uint64_t total_min=conv->totalBytes()/
(60*rdlibrary_conf->defaultChannels()*lib_system->sampleRate());
disk_bar->setTotalSteps(total_min);
disk_bar->setProgress(free_min);
disk_space_label->setText(QString().sprintf("%luh %02lum",free_min/60,
free_min-60*(free_min/60)));
disk_label->setEnabled(true);
disk_bar->setEnabled(true);
disk_space_label->setEnabled(true);
}
delete conv;
disk_timer->stop();
disk_timer->start(DISK_GAUGE_UPDATE_INTERVAL,true);
}
@@ -98,10 +117,3 @@ void DiskGauge::resizeEvent(QResizeEvent *e)
setGeometry(0,size().height()/2,size().width(),size().height()/2);
delete fm;
}
int DiskGauge::GetMinutes(long blocks,long block_size)
{
return (int)(((double)blocks*(double)block_size)/
(disk_sample_rate*disk_channels*120.0));
}