Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-21 08:01:16 +01:00
Code Issues Projects Releases Wiki Activity

2025-04-28 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Upgrade Qt dependency from Qt5 to Qt6.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2025-04-28 09:20:03 -04:00
parent 5950a9f7ab
commit 162aa3e483
169 changed files with 747 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rdlibrary/Makefile.am
View File

@@ -1,8 +1,8 @@
## automake.am
##
## Automake.am for rivendell/rdlibrary
## Makefile.am for rivendell/rdlibrary
##
## (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-2025 Fred Gleason <fredg@paravelsystems.com>
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License version 2 as
@@ -20,9 +20,9 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @IMAGEMAGICK_CFLAGS@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++17 -fPIC -I$(top_srcdir)/lib @QT6_CFLAGS@ @IMAGEMAGICK_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
MOC = @QT6_MOC@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@@ -75,7 +75,7 @@ nodist_rdlibrary_SOURCES = moc_audio_cart.cpp\
moc_rdlibrary.cpp\
moc_record_cut.cpp
rdlibrary_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdlibrary_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
EXTRA_DIST = rdlibrary.pro\
rdlibrary_cs.ts\

6
rdlibrary/disk_ripper.cpp
View File

@@ -502,7 +502,6 @@ void DiskRipper::ejectedData()
rip_cddb_label->hide();
rip_cdtext_label->hide();
rip_cddb_label->hide();
rip_track=-1;
rip_artist_edit->clear();
rip_album_edit->clear();
rip_other_edit->clear();
@@ -729,7 +728,6 @@ void DiskRipper::mediaChangedData()
}
rip_wave_datas.clear();
rip_track_model->clear();
rip_track=-1;
rip_setcut_button->setDisabled(true);
rip_setall_button->setDisabled(true);
rip_setsingle_button->setDisabled(true);
@@ -781,7 +779,6 @@ void DiskRipper::lookupDoneData(RDDiscLookup::Result result,
else {
rip_apply_box->hide();
rip_apply_label->hide();
rip_track=-1;
rip_cdtext_label->hide();
rip_cddb_label->hide();
return; // Apply no metadata
@@ -793,7 +790,6 @@ void DiskRipper::lookupDoneData(RDDiscLookup::Result result,
if(rip_cdrom->status()!=RDCdPlayer::Ok) {
rip_apply_box->hide();
rip_apply_label->hide();
rip_track=-1;
rip_cdtext_label->hide();
rip_cddb_label->hide();
return;
@@ -844,7 +840,6 @@ void DiskRipper::lookupDoneData(RDDiscLookup::Result result,
case RDDiscLookup::NoMatch:
rip_apply_box->hide();
rip_apply_label->hide();
rip_track=-1;
rip_cdtext_label->hide();
rip_cddb_label->hide();
break;
@@ -854,7 +849,6 @@ void DiskRipper::lookupDoneData(RDDiscLookup::Result result,
" "+tr("Lookup Error"),err_msg);
rip_apply_box->hide();
rip_apply_label->hide();
rip_track=-1;
rip_cdtext_label->hide();
rip_cddb_label->hide();
break;

1
rdlibrary/disk_ripper.h
View File

@@ -111,7 +111,6 @@ class DiskRipper : public RDDialog
QPushButton *rip_cartlabel_button;
QPushButton *rip_clear_button;
QString rip_cutname;
QString rip_track;
QString rip_title;
QLabel *rip_diskbar_label;
QProgressBar *rip_disk_bar;

4
rdlibrary/libraryview.cpp
View File

@@ -2,7 +2,7 @@
//
// QTreeView widget that supports cart dragging.
//
// (C) Copyright 2020-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2020-2025 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -46,7 +46,7 @@ void LibraryView::mousePressEvent(QMouseEvent *e)
RDCartDrag *cd=
new RDCartDrag(mod->cartNumber(index),
mod->data(mod->index(index.row(),4)).toString(),
mod->data(mod->index(index.row(),1),Qt::TextColorRole).
mod->data(mod->index(index.row(),1),Qt::ForegroundRole).
value<QColor>());
drag->setMimeData(cd);
drag->setPixmap(mod->data(mod->index(index.row(),0),Qt::DecorationRole).