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

2020-02-03 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified both CD rippers in rdlibrary(1) to display a
	'MusicBrainz' button only when the host station has been configured
	to use a browser.
This commit is contained in:
Fred Gleason 2020-02-03 12:05:41 -05:00
parent c3376084b6
commit f4e174f37e
5 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -19486,3 +19486,7 @@
confound track info in multi-disc releases.
* Fixed a bug in the MusicBrainz CD lookup that caused it to
segfault when processing release with no Label information.
2020-02-03 Fred Gleason <fredg@paravelsystems.com>
* Modified both CD rippers in rdlibrary(1) to display a
'MusicBrainz' button only when the host station has been configured
to use a browser.

14
rdlibrary/cdripper.cpp
View File

@ -153,9 +153,21 @@ CdRipper::CdRipper(QString cutname,RDDiscRecord *rec,RDLibraryConf *conf,
rip_browser_button=new QPushButton(this);
rip_browser_button->setPixmap(rip_disc_lookup->sourceLogo());
rip_browser_button->setDisabled(true);
rip_browser_label=new QLabel(this);
rip_browser_label->setPixmap(rip_disc_lookup->sourceLogo());
rip_browser_label->setDisabled(true);
connect(rip_browser_button,SIGNAL(clicked()),this,SLOT(openBrowserData()));
if(rip_disc_lookup->sourceLogo().isNull()) {
rip_browser_button->hide();
rip_browser_label->hide();
}
else {
if(rda->station()->browserPath().isEmpty()) {
rip_browser_button->hide();
}
else {
rip_browser_label->hide();
}
}
//
@ -609,6 +621,7 @@ void CdRipper::lookupDoneData(RDDiscLookup::Result result,const QString &err_msg
rip_apply_box->setEnabled(true);
rip_apply_label->setEnabled(true);
rip_browser_button->setDisabled(rip_disc_lookup->sourceUrl().isNull());
rip_browser_label->setDisabled(rip_disc_lookup->sourceUrl().isNull());
trackSelectionChangedData();
break;
@ -675,6 +688,7 @@ void CdRipper::resizeEvent(QResizeEvent *e)
rip_apply_box->setGeometry(65,162,15,15);
rip_apply_label->setGeometry(85,162,250,20);
rip_browser_button->setGeometry(size().width()-260,161,200,35);
rip_browser_label->setGeometry(size().width()-260,161,200,35);
rip_track_list->setGeometry(10,200,size().width()-110,size().height()-290);
rip_track_label->setGeometry(10,184,100,14);
rip_bar->setGeometry(10,size().height()-100,size().width()-112,20);

1
rdlibrary/cdripper.h
View File

@ -97,6 +97,7 @@ class CdRipper : public RDDialog
QCheckBox *rip_apply_box;
QLabel *rip_apply_label;
QPushButton *rip_browser_button;
QLabel *rip_browser_label;
RDTransportButton *rip_eject_button;
RDTransportButton *rip_play_button;
RDTransportButton *rip_stop_button;

17
rdlibrary/disk_ripper.cpp
View File

@ -132,14 +132,26 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode,
rip_apply_label->setVisible(!rip_disc_lookup->sourceName().isNull());
//
// Web Browser Button
// Web Browser Button/Label
//
rip_browser_button=new QPushButton(this);
rip_browser_button->setPixmap(rip_disc_lookup->sourceLogo());
rip_browser_button->setDisabled(true);
rip_browser_label=new QLabel(this);
rip_browser_label->setPixmap(rip_disc_lookup->sourceLogo());
rip_browser_label->setDisabled(true);
connect(rip_browser_button,SIGNAL(clicked()),this,SLOT(openBrowserData()));
if(rip_disc_lookup->sourceLogo().isNull()) {
rip_browser_button->hide();
rip_browser_label->hide();
}
else {
if(rda->station()->browserPath().isEmpty()) {
rip_browser_button->hide();
}
else {
rip_browser_label->hide();
}
}
//
@ -482,6 +494,7 @@ void DiskRipper::ejectedData()
rip_apply_box->setDisabled(true);
rip_apply_label->setDisabled(true);
rip_browser_button->setDisabled(true);
rip_browser_label->setDisabled(true);
}
@ -818,6 +831,7 @@ void DiskRipper::lookupDoneData(RDDiscLookup::Result result,
rip_apply_box->setEnabled(true);
rip_apply_label->setEnabled(true);
rip_browser_button->setDisabled(rip_disc_lookup->sourceUrl().isNull());
rip_browser_label->setDisabled(rip_disc_lookup->sourceUrl().isNull());
break;
case RDDiscLookup::NoMatch:
@ -925,6 +939,7 @@ void DiskRipper::resizeEvent(QResizeEvent *e)
rip_apply_box->setGeometry(65,118,15,15);
rip_apply_label->setGeometry(85,118,250,20);
rip_browser_button->setGeometry(size().width()-260,117,200,35);
rip_browser_label->setGeometry(size().width()-260,117,200,35);
rip_track_label->setGeometry(100,140,100,14);
rip_track_list->setGeometry(100,156,size().width()-202,size().height()-342);
rip_diskbar_label->setGeometry(10,size().height()-174,size().width()-110,20);

1
rdlibrary/disk_ripper.h
View File

@ -90,6 +90,7 @@ class DiskRipper : public RDDialog
QCheckBox *rip_apply_box;
QLabel *rip_apply_label;
QPushButton *rip_browser_button;
QLabel *rip_browser_label;
RDTransportButton *rip_eject_button;
RDTransportButton *rip_play_button;
RDTransportButton *rip_stop_button;