Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-16 07:31:19 +02:00
Code Issues Projects Releases Wiki Activity

2021-02-24 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Updated build system to use Qt5 instead of Qt4.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-24 16:12:22 -05:00
parent 5131b1d5fe
commit 57abeada3c
130 changed files with 481 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/rdimport/Makefile.am
View File

@@ -17,7 +17,7 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
@@ -33,7 +33,7 @@ dist_rdimport_SOURCES = journal.cpp journal.h\
nodist_rdimport_SOURCES = moc_rdimport.cpp
rdimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
rdimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@
CLEANFILES = *~\
*.idb\

8
utils/rdimport/rdimport.cpp
View File

@@ -1836,7 +1836,7 @@ bool MainObject::RunPattern(const QString &pattern,const QString &filename,
if(macro_active) {
if((i==filename.length())||
((!delimiter.isNull())&&(filename.at(i)==delimiter))) {
switch(field.toAscii()) {
switch(field.cell()) {
case 'a':
wavedata->setArtist(value);
wavedata->setMetadataFound(true);
@@ -1960,7 +1960,7 @@ bool MainObject::RunPattern(const QString &pattern,const QString &filename,
break;
case 'w':
switch(subfield.toAscii()) {
switch(subfield.cell()) {
case 'c':
wavedata->setIsci(value);
wavedata->setMetadataFound(true);
@@ -2089,7 +2089,7 @@ bool MainObject::VerifyPattern(const QString &pattern)
if(i>=(pattern.length()-1)) {
return false;
}
switch(pattern.at(++i).toAscii()) {
switch(pattern.at(++i).cell()) {
case 'a':
case 'b':
case 'c':
@@ -2117,7 +2117,7 @@ bool MainObject::VerifyPattern(const QString &pattern)
if(i>=(pattern.length()-1)) {
return false;
}
switch(pattern.at(++i).toAscii()) {
switch(pattern.at(++i).cell()) {
case 'i':
case 'm':
case 'r':