diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am index e40e53dce11ea81c0593f789251d54b83015b550..0eb59045375f86ae296f3aae22dfe9d4648465f6 100644 --- a/modules/gui/qt/Makefile.am +++ b/modules/gui/qt/Makefile.am @@ -412,7 +412,6 @@ nodist_libqt_plugin_la_SOURCES = \ gui/qt/util/asynctask.moc.cpp \ gui/qt/util/audio_device_model.moc.cpp \ gui/qt/util/color_scheme_model.moc.cpp \ - gui/qt/util/covergenerator.moc.cpp \ gui/qt/util/imageluminanceextractor.moc.cpp \ gui/qt/util/i18n.moc.cpp \ gui/qt/util/keyhelper.moc.cpp \ diff --git a/modules/gui/qt/util/covergenerator.cpp b/modules/gui/qt/util/covergenerator.cpp index 83ebb3afdb8a920dc71a62d36ace7935840a6578..d2496847b6b91d8c715e730c32ef2d80c2f6d63e 100644 --- a/modules/gui/qt/util/covergenerator.cpp +++ b/modules/gui/qt/util/covergenerator.cpp @@ -60,49 +60,49 @@ CoverGenerator::CoverGenerator(vlc_medialibrary_t * ml, const MLItemId & itemId) // Interface //------------------------------------------------------------------------------------------------- -/* Q_INVOKABLE */ MLItemId CoverGenerator::getId() +MLItemId CoverGenerator::getId() { return m_id; } //------------------------------------------------------------------------------------------------- -/* Q_INVOKABLE */ void CoverGenerator::setSize(const QSize & size) +void CoverGenerator::setSize(const QSize & size) { m_size = size; } -/* Q_INVOKABLE */ void CoverGenerator::setCountX(int x) +void CoverGenerator::setCountX(int x) { m_countX = x; } -/* Q_INVOKABLE */ void CoverGenerator::setCountY(int y) +void CoverGenerator::setCountY(int y) { m_countY = y; } -/* Q_INVOKABLE */ void CoverGenerator::setSplit(Split split) +void CoverGenerator::setSplit(Split split) { m_split = split; } -/* Q_INVOKABLE */ void CoverGenerator::setSmooth(bool enabled) +void CoverGenerator::setSmooth(bool enabled) { m_smooth = enabled; } -/* Q_INVOKABLE */ void CoverGenerator::setBlur(int radius) +void CoverGenerator::setBlur(int radius) { m_blur = radius; } -/* Q_INVOKABLE */ void CoverGenerator::setDefaultThumbnail(const QString & fileName) +void CoverGenerator::setDefaultThumbnail(const QString & fileName) { m_default = fileName; } -/* Q_INVOKABLE */ void CoverGenerator::setPrefix(const QString & prefix) +void CoverGenerator::setPrefix(const QString & prefix) { m_prefix = prefix; } diff --git a/modules/gui/qt/util/covergenerator.hpp b/modules/gui/qt/util/covergenerator.hpp index 1181e910332b469456fbefa7dd5140298e6428b7..4358e96be13c91980dfff599a1dbb9b6eb4a3152 100644 --- a/modules/gui/qt/util/covergenerator.hpp +++ b/modules/gui/qt/util/covergenerator.hpp @@ -38,12 +38,8 @@ struct vlc_medialibrary_t; class MLItemId; -class CoverGenerator : public QObject +class CoverGenerator { - Q_OBJECT - - Q_ENUMS(Split) - public: // Enums enum Split { @@ -55,26 +51,26 @@ public: CoverGenerator(vlc_medialibrary_t * ml, const MLItemId & itemId); public: // Interface - Q_INVOKABLE MLItemId getId(); + MLItemId getId(); - Q_INVOKABLE void setSize(const QSize & size); + void setSize(const QSize & size); - Q_INVOKABLE void setCountX(int x); - Q_INVOKABLE void setCountY(int y); + void setCountX(int x); + void setCountY(int y); // NOTE: Do we want to divide or duplicate thumbnails to reach the proper count ? - Q_INVOKABLE void setSplit(Split split); + void setSplit(Split split); // NOTE: Applies SmoothTransformation to thumbnails. Disabled by default. - Q_INVOKABLE void setSmooth(bool enabled); + void setSmooth(bool enabled); // NOTE: You need to specify a radius to enable blur, 8 looks good. - Q_INVOKABLE void setBlur(int radius); + void setBlur(int radius); - Q_INVOKABLE void setDefaultThumbnail(const QString & fileName); + void setDefaultThumbnail(const QString & fileName); // NOTE: This lets us enforce a specific prefix for the cover fileName. - Q_INVOKABLE void setPrefix(const QString & prefix); + void setPrefix(const QString & prefix); bool cachedFileAvailable() const;