2022-08-31 Fred Gleason <fredg@paravelsystems.com>

* Renamed the 'CD Metadata Source' control in rdlibrary(1) to use
	'CDDB' instead of 'FreeDB' when configuring CDDB lookups.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-08-31 12:20:49 -04:00
parent 48a24299bf
commit c0ceda64f4
12 changed files with 107 additions and 30 deletions

View File

@ -20918,3 +20918,6 @@
* Modified the per-track ripper in rdlibrary(1) to use CD-Text.
2022-08-31 Fred Gleason <fredg@paravelsystems.com>
* Removed a debugging printf() from 'lib/rdcddblookup.cpp'.
2022-08-31 Fred Gleason <fredg@paravelsystems.com>
* Renamed the 'CD Metadata Source' control in rdlibrary(1) to use
'CDDB' instead of 'FreeDB' when configuring CDDB lookups.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 51 KiB

View File

@ -965,10 +965,60 @@
newly inserted discs when the disc does not contain ISRC data.
</para>
<para>
The <computeroutput>FreeDB Server:</computeroutput> field takes the
URL of the server to be used for doing FreeDB lookups for CDs by
the CD ripper.
The <computeroutput>CD Metadata Source:</computeroutput> dropdown
indicates which external directory service (if any) will be searched
by CD rippers for disc metadata. Choices are:
</para>
<variablelist>
<varlistentry>
<term><computeroutput>None</computeroutput></term>
<listitem>
<para>
Perform no external lookups.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><computeroutput>CDDB</computeroutput></term>
<listitem>
<para>
Perform lookups using the
<link xlink:href="https://en.wikipedia.org/wiki/CDDB"> Compact
Disc Database</link> protocol. CDDB is a registered trademark
of Gracenote, Inc.
</para>
<para>
If this value is selected, than a
<computeroutput>CDDB Server:</computeroutput> field will
also appear, which takes the hostname of the CDDB server
to use (default value <userinput>freedb.freedb.org</userinput>).
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><computeroutput>MusicBrainz</computeroutput></term>
<listitem>
<para>
Perform lookups using the
<link xlink:xref="https://musicbrainz.org/">MusicBrainz
open music encyclopedia</link>.
</para>
<para>
If this value is selected, than a
<computeroutput>MusicBrainz Server:</computeroutput> field will
also appear, which takes the hostname of the MusicBrainz server
to use (default value <userinput>musicbrainz.org</userinput>).
</para>
</listitem>
</varlistentry>
</variablelist>
<note>
Rivendell's CD rippers will also attempt to detect
<link xlink:href="https://en.wikipedia.org/wiki/CD-Text">CD-Text
data</link>
on all discs and will use any information so detected in
preference to that supplied by an external lookup.
</note>
<para>
The <computeroutput>Format:</computeroutput> dropdown indicates the
audio encoding format to be used in Rivendell's audio store for

View File

@ -420,7 +420,7 @@ QString RDLibraryConf::cdServerTypeText(RDLibraryConf::CdServerType type)
break;
case RDLibraryConf::CddbType:
ret="FreeDB";
ret="CDDB";
break;
case RDLibraryConf::MusicBrainzType:

View File

@ -225,7 +225,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station,
lib_mb_server_edit=new QLineEdit(this);
lib_mb_server_edit->setGeometry(190,278,160,19);
lib_mb_server_edit->setValidator(validator);
lib_cd_server_label=new QLabel(tr("&FreeDB Server:"),this);
lib_cd_server_label=new QLabel(tr("CDDB Server:"),this);
lib_cd_server_label->setFont(labelFont());
lib_cd_server_label->setGeometry(25,278,160,19);
lib_cd_server_label->
@ -505,7 +505,7 @@ void EditRDLibrary::cdServerTypeData(int n)
case RDLibraryConf::CddbType:
lib_cd_server_label->setEnabled(true);
lib_cd_server_label->setText(tr("FreeDB Server")+":");
lib_cd_server_label->setText(tr("CDDB Server")+":");
lib_cddb_server_edit->setEnabled(true);
lib_cddb_server_edit->show();
lib_mb_server_edit->hide();

View File

@ -2953,7 +2953,7 @@ GPIOs</source>
</message>
<message>
<source>&amp;FreeDB Server:</source>
<translation>Server &amp;FreeDB:</translation>
<translation type="obsolete">Server &amp;FreeDB:</translation>
</message>
<message>
<source>&amp;Format:</source>
@ -3150,11 +3150,15 @@ nastaveném pro běh služby CAE pro naplnění databáze se zdroji zvuku.</tran
<translation type="unfinished"></translation>
</message>
<message>
<source>FreeDB Server</source>
<source>MusicBrainz Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MusicBrainz Server</source>
<source>CDDB Server:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CDDB Server</source>
<translation type="unfinished"></translation>
</message>
</context>

View File

@ -2797,7 +2797,7 @@ GPIOs</source>
</message>
<message>
<source>&amp;FreeDB Server:</source>
<translation>&amp;FreeDB Server:</translation>
<translation type="obsolete">&amp;FreeDB Server:</translation>
</message>
<message>
<source>&amp;Format:</source>
@ -2992,11 +2992,15 @@ configured to run the CAE service in order to populate the audio resources datab
<translation type="unfinished"></translation>
</message>
<message>
<source>FreeDB Server</source>
<source>MusicBrainz Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MusicBrainz Server</source>
<source>CDDB Server:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CDDB Server</source>
<translation type="unfinished"></translation>
</message>
</context>

View File

@ -2951,7 +2951,7 @@ GPIOs</source>
</message>
<message>
<source>&amp;FreeDB Server:</source>
<translation>Servidor &amp;FreeDB:</translation>
<translation type="obsolete">Servidor &amp;FreeDB:</translation>
</message>
<message>
<source>&amp;Format:</source>
@ -3134,11 +3134,15 @@ equipo configurado para ejecutar CAE para obtener la información de audio.</tra
<translation type="unfinished"></translation>
</message>
<message>
<source>FreeDB Server</source>
<source>MusicBrainz Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MusicBrainz Server</source>
<source>CDDB Server:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CDDB Server</source>
<translation type="unfinished"></translation>
</message>
</context>

View File

@ -2267,10 +2267,6 @@ GPIOs</source>
<source>&amp;Paranoia Level:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;FreeDB Server:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Format:</source>
<translation type="unfinished"></translation>
@ -2434,11 +2430,15 @@ configured to run the CAE service in order to populate the audio resources datab
<translation type="unfinished"></translation>
</message>
<message>
<source>FreeDB Server</source>
<source>MusicBrainz Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MusicBrainz Server</source>
<source>CDDB Server:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CDDB Server</source>
<translation type="unfinished"></translation>
</message>
</context>

View File

@ -2729,7 +2729,7 @@ GPIOs</source>
</message>
<message>
<source>&amp;FreeDB Server:</source>
<translation>&amp;FreeDB-tenar:</translation>
<translation type="obsolete">&amp;FreeDB-tenar:</translation>
</message>
<message>
<source>&amp;Format:</source>
@ -2924,11 +2924,15 @@ configured to run the CAE service in order to populate the audio resources datab
<translation type="unfinished"></translation>
</message>
<message>
<source>FreeDB Server</source>
<source>MusicBrainz Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MusicBrainz Server</source>
<source>CDDB Server:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CDDB Server</source>
<translation type="unfinished"></translation>
</message>
</context>

View File

@ -2729,7 +2729,7 @@ GPIOs</source>
</message>
<message>
<source>&amp;FreeDB Server:</source>
<translation>&amp;FreeDB-tenar:</translation>
<translation type="obsolete">&amp;FreeDB-tenar:</translation>
</message>
<message>
<source>&amp;Format:</source>
@ -2924,11 +2924,15 @@ configured to run the CAE service in order to populate the audio resources datab
<translation type="unfinished"></translation>
</message>
<message>
<source>FreeDB Server</source>
<source>MusicBrainz Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MusicBrainz Server</source>
<source>CDDB Server:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CDDB Server</source>
<translation type="unfinished"></translation>
</message>
</context>

View File

@ -2777,7 +2777,7 @@ GPIOs</source>
</message>
<message>
<source>&amp;FreeDB Server:</source>
<translation>Servidor &amp;FreeDB:</translation>
<translation type="obsolete">Servidor &amp;FreeDB:</translation>
</message>
<message>
<source>&amp;Format:</source>
@ -2972,11 +2972,15 @@ configured to run the CAE service in order to populate the audio resources datab
<translation type="unfinished"></translation>
</message>
<message>
<source>FreeDB Server</source>
<source>MusicBrainz Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MusicBrainz Server</source>
<source>CDDB Server:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CDDB Server</source>
<translation type="unfinished"></translation>
</message>
</context>