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

2022-11-07 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added a dependency for ImageMagick's 'Magick++' library interface.
	* Added a 'FEED_IMAGES.DATA_MID_THUMB' field to the database.
	* Added a 'FEED_IMAGES.DATA_SMALL_THUMB' field to the database.
	* Incremented the database version to 365.
	* Optimized loading of thumbnail image data in rdadmin(1),
	rdcastmanager(1) and rdcatch(1).
	* Re-enabled uploads to RSS feeds in rdcatch(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-11-07 16:52:13 -05:00
parent c9c64757ae
commit 4a3454cb8d
66 changed files with 323 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rdcatch/Makefile.am
View File

@@ -20,7 +20,7 @@
##
## 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@ @MUSICBRAINZ_CFLAGS@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
@@ -77,7 +77,7 @@ nodist_rdcatch_SOURCES = moc_add_recording.cpp\
moc_vbox.cpp
rdcatch_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@
rdcatch_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
EXTRA_DIST = rdcatch.pro\

11
rdcatch/edit_upload.cpp
View File

@@ -74,16 +74,10 @@ EditUpload::EditUpload(QString *filter,QWidget *parent)
edit_feed_label=new QLabel(tr("RSS Feed:"),this);
edit_feed_label->setFont(labelFont());
edit_feed_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
/*
* FIXME: Causes Broken pipe errors with large DBs. Why?
*
edit_feed_model=new RDFeedListModel(true,true,this);
edit_feed_model->setFont(defaultFont());
edit_feed_box->setModel(edit_feed_model);
*/
edit_feed_box->insertItem(0,tr("[none]"));
edit_feed_label->setDisabled(true);
edit_feed_box->setDisabled(true);
//
// Url
@@ -612,10 +606,6 @@ void EditUpload::Save()
edit_recording->setNormalizationLevel(1);
}
//
// FIXME: The indexing schema for feeds is lame and fundamentally broken.
//
/*
int feed_id=edit_feed_model->
feedId(edit_feed_model->index(edit_feed_box->currentIndex(),0));
if(feed_id==0) {
@@ -624,7 +614,6 @@ void EditUpload::Save()
else {
edit_recording->setFeedId(feed_id);
}
*/
}

2
rdcatch/edit_upload.h
View File

@@ -76,7 +76,7 @@ class EditUpload : public RDDialog
EventWidget *edit_event_widget;
QLabel *edit_feed_label;
QComboBox *edit_feed_box;
// RDFeedListModel *edit_feed_model;
RDFeedListModel *edit_feed_model;
QLabel *edit_description_label;
QLineEdit *edit_description_edit;
QPushButton *edit_source_select_button;

2
rdcatch/rdcatch.cpp
View File

@@ -298,6 +298,8 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
}
delete q;
QTime start=QTime::currentTime();
//
// Cart List
//

6
rdcatch/recordlistmodel.cpp
View File

@@ -538,7 +538,7 @@ void RecordListModel::updateModel(const QString &filter_sql)
d_feed_images.clear();
sql=QString("select ")+
"`ID`,"+ // 00
"`DATA` "+ // 01
"`DATA_SMALL_THUMB` "+ // 01
"from `FEED_IMAGES`";
q=new RDSqlQuery(sql);
while(q->next()) {
@@ -546,9 +546,13 @@ void RecordListModel::updateModel(const QString &filter_sql)
d_feed_images[q->value(0).toUInt()]=QVariant();
}
else {
/*
d_feed_images[q->value(0).toUInt()]=
QImage::fromData(q->value(1).toByteArray()).
scaled(22,22,Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
*/
d_feed_images[q->value(0).toUInt()]=
QImage::fromData(q->value(1).toByteArray());
}
}
delete q;