Skip to content

Commit

Permalink
MythMusic: metadata and album art updates.
Browse files Browse the repository at this point in the history
* extract and cache embedded album art images to speed up their display.
* add a Metadata::getTagger() function to get the appropriate tagger for a file.
* Move QImage *MetaIOID3::getAlbumArt(QString filename, ImageType type) to the
  base class and make it virtual.
* Lots of other clean ups.
  • Loading branch information
Paul Harrison committed Jun 5, 2011
1 parent bff8594 commit a4c8189
Show file tree
Hide file tree
Showing 11 changed files with 538 additions and 323 deletions.
2 changes: 1 addition & 1 deletion mythplugins/mythmusic/mythmusic/cddecoder.cpp
Expand Up @@ -587,7 +587,7 @@ const QString &CdDecoderFactory::extension() const

const QString &CdDecoderFactory::description() const
{
static QString desc(QObject::tr("Ogg Vorbis Audio"));
static QString desc(QObject::tr("CD Audio decoder"));
return desc;
}

Expand Down
11 changes: 5 additions & 6 deletions mythplugins/mythmusic/mythmusic/editmetadata.cpp
Expand Up @@ -125,7 +125,7 @@ void EditMetadataDialog::gridItemChanged(ImageGridItem *item)
coverart_image->SetImage(image->filename);
coverart_image->LoadImage();
if (imagetype_text)
imagetype_text->SetText(image->typeName);
imagetype_text->SetText(AlbumArtImages::getTypeName(image->imageType));
if (imagefilename_text)
{
QFileInfo fi(image->filename);
Expand All @@ -137,7 +137,7 @@ void EditMetadataDialog::gridItemChanged(ImageGridItem *item)

void EditMetadataDialog::updateImageGrid()
{
vector<AlbumArtImage*> *albumArtList = albumArt->getImageList();
AlbumArtList *albumArtList = albumArt->getImageList();

QSize size = coverart_grid->getImageItemSize();

Expand All @@ -150,7 +150,7 @@ void EditMetadataDialog::updateImageGrid()
size.width(), size.height(),
Qt::KeepAspectRatio);

ImageGridItem *item = new ImageGridItem(albumArtList->at(x)->typeName,
ImageGridItem *item = new ImageGridItem(AlbumArtImages::getTypeName(albumArtList->at(x)->imageType),
pixmap, false, (void*) albumArtList->at(x));
coverart_grid->appendItem(item);
}
Expand Down Expand Up @@ -643,7 +643,7 @@ void EditMetadataDialog::saveToMetadata()
{
cancelPopup();

*m_sourceMetadata = m_metadata;
*m_sourceMetadata = *m_metadata;
accept();
}

Expand All @@ -652,7 +652,7 @@ void EditMetadataDialog::saveToDatabase()
cancelPopup();

m_metadata->dumpToDatabase();
*m_sourceMetadata = m_metadata;
*m_sourceMetadata = *m_metadata;

accept();
}
Expand Down Expand Up @@ -704,7 +704,6 @@ void EditMetadataDialog::showMenu()
if (image)
{
image->imageType = (ImageType) res;
image->typeName = item->text;

// save the image type to the DB
albumArt->saveImageType(image->id, image->imageType);
Expand Down
6 changes: 5 additions & 1 deletion mythplugins/mythmusic/mythmusic/mainvisual.cpp
Expand Up @@ -354,7 +354,11 @@ void InfoWidget::showMetadata(Metadata *mdata, bool fullScreen, int visMode)
return;

QString text = "\"" + mdata->Title() + "\"\n" + mdata->Artist() + "\n" + mdata->Album();
QImage albumArt = mdata->getAlbumArt();

QImage albumArt;
QString imageFilename = mdata->getAlbumArtFile();
if (!imageFilename.isEmpty())
albumArt.load(imageFilename);

if (text == info)
return;
Expand Down

0 comments on commit a4c8189

Please sign in to comment.