Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-04 06:02:40 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Corrected an error in 'rdlibrary/disk_gauge.cpp' that generated
	incorrect free time values.
This commit is contained in:
Fred Gleason 2014-10-10 11:11:06 -04:00
parent 5935d19ca6
commit 35b61a1122
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -14544,3 +14544,6 @@
* Modified the Desk Gauge widget in 'rdlibrary/disk_gauge.cpp' * Modified the Desk Gauge widget in 'rdlibrary/disk_gauge.cpp'
and 'rdlibrary/disk_gauge.h' to use the 'RDAudioStore' class and 'rdlibrary/disk_gauge.h' to use the 'RDAudioStore' class
[fixes GitHub issue #000035]. [fixes GitHub issue #000035].
2014-10-10 Fred Gleason <fredg@paravelsystems.com>
* Corrected an error in 'rdlibrary/disk_gauge.cpp' that generated
incorrect free time values.

25
rdlibrary/disk_gauge.cpp
View File

@ -89,10 +89,8 @@ void DiskGauge::update()
RDAudioStore *conv=new RDAudioStore(rdstation_conf,lib_config,this); RDAudioStore *conv=new RDAudioStore(rdstation_conf,lib_config,this);
if((conv_err=conv->runStore(lib_user->name(),lib_user->password()))== if((conv_err=conv->runStore(lib_user->name(),lib_user->password()))==
RDAudioStore::ErrorOk) { RDAudioStore::ErrorOk) {
uint64_t free_min=conv->freeBytes()/ uint64_t free_min=GetMinutes(conv->freeBytes());
(60*rdlibrary_conf->defaultChannels()*lib_system->sampleRate()); uint64_t total_min=GetMinutes(conv->totalBytes());
uint64_t total_min=conv->totalBytes()/
(60*rdlibrary_conf->defaultChannels()*lib_system->sampleRate());
disk_bar->setTotalSteps(total_min); disk_bar->setTotalSteps(total_min);
disk_bar->setProgress(free_min); disk_bar->setProgress(free_min);
disk_space_label->setText(QString().sprintf("%luh %02lum",free_min/60, disk_space_label->setText(QString().sprintf("%luh %02lum",free_min/60,
@ -117,3 +115,22 @@ void DiskGauge::resizeEvent(QResizeEvent *e)
setGeometry(0,size().height()/2,size().width(),size().height()/2); setGeometry(0,size().height()/2,size().width(),size().height()/2);
delete fm; delete fm;
} }
unsigned DiskGauge::GetMinutes(uint64_t bytes)
{
unsigned ret=0;
switch(rdlibrary_conf->defaultFormat()) {
case 1: // MPEG Layer 2
ret=bytes*2/(rdlibrary_conf->defaultChannels()*
rdlibrary_conf->defaultBitrate()*15);
break;
default: // PCM16
ret=bytes/(rdlibrary_conf->defaultChannels()*2*lib_system->sampleRate()*60);
break;
}
return ret;
}

3
rdlibrary/disk_gauge.h
View File

@ -23,6 +23,8 @@
#ifndef DISK_GAUGE_H #ifndef DISK_GAUGE_H
#define DISK_GAUGE_H #define DISK_GAUGE_H
#include <stdint.h>
#include <qwidget.h> #include <qwidget.h>
#include <qlabel.h> #include <qlabel.h>
#include <qtimer.h> #include <qtimer.h>
@ -45,6 +47,7 @@ class DiskGauge : public QWidget
void resizeEvent(QResizeEvent *e); void resizeEvent(QResizeEvent *e);
private: private:
unsigned GetMinutes(uint64_t bytes);
QLabel *disk_label; QLabel *disk_label;
QProgressBar *disk_bar; QProgressBar *disk_bar;
QLabel *disk_space_label; QLabel *disk_space_label;