From 4d8d01509cbfae35ea4167519c7ae8a86f009eb4 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Sat, 22 Oct 2022 13:01:26 -0400 Subject: [PATCH] 2022-10-22 Fred Gleason * Added an 'icedax' dependency to the 'rivendell' DEB package. * Documented the 'icedax' dependency in 'INSTALL'. Signed-off-by: Fred Gleason --- ChangeLog | 3 +++ INSTALL | 4 ++++ debian/control.src | 2 +- lib/rddisclookup.cpp | 13 ++++++++++--- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0ce40bd..5d6a15cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23553,3 +23553,6 @@ the stack of deck monitors. 2022-10-22 Fred Gleason * Added an 'icedax' dependency to the 'rivendell' RPM package. +2022-10-22 Fred Gleason + * Added an 'icedax' dependency to the 'rivendell' DEB package. + * Documented the 'icedax' dependency in 'INSTALL'. diff --git a/INSTALL b/INSTALL index a3d62258..720b7db4 100644 --- a/INSTALL +++ b/INSTALL @@ -10,6 +10,10 @@ Included with most distros, or available from: http://www.apache.org/. Expat A stream-oriented XML parser library. Available at https://libexpat.github.io/. +Icedax +A command-line utility for querying and extracting data from audio CDs. +Included with most distros. + ID3Lib An audio metadata tag library. Included in most distros, or available at http://id3lib.sourceforge.net/. diff --git a/debian/control.src b/debian/control.src index e67a8df4..3b5bd823 100644 --- a/debian/control.src +++ b/debian/control.src @@ -7,7 +7,7 @@ Standards-Version: 4.4.1 Package: rivendell Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, mariadb-client, libqt5sql5-mysql, qttranslations5-l10n, apache2, curl, rsyslog, python3, python3-pycurl, python3-mysqldb, python3-serial, python3-requests +Depends: ${shlibs:Depends}, ${misc:Depends}, mariadb-client, libqt5sql5-mysql, qttranslations5-l10n, apache2, curl, rsyslog, python3, python3-pycurl, python3-mysqldb, python3-serial, python3-requests, icedax Replaces: rivendell-pypad Description: Radio Broadcast Automation System Rivendell is a complete radio broadcast automation solution, with diff --git a/lib/rddisclookup.cpp b/lib/rddisclookup.cpp index cbab6a5d..408823e9 100644 --- a/lib/rddisclookup.cpp +++ b/lib/rddisclookup.cpp @@ -476,9 +476,16 @@ bool RDDiscLookup::ReadCdText(const QString &cdda_dev) return false; } if((exit_code=proc->exitCode())!=0) { - QMessageBox::warning(this,lookup_caption+" - "+tr("Ripper Error"), - tr("CD-Text reader process returned an error!")+"\n"+ - "["+output+"]"); + if(output.isEmpty()) { + QMessageBox::warning(this,lookup_caption+" - "+tr("Ripper Error"), + tr("CD-Text reader process failed.")+"\n"+ + "["+tr("Call to \"/usr/bin/cdda2wav\" failed")+"]"); + } + else { + QMessageBox::warning(this,lookup_caption+" - "+tr("Ripper Error"), + tr("CD-Text reader process returned an error!")+"\n"+ + "["+output+"]"); + } delete proc; return false; }