Changeset 549fb22e17 in mythtv


Ignore:
Timestamp:
Oct 1, 2013, 2:37:29 PM (11 years ago)
Author:
Stuart Morgan <smorgan@…>
Branches:
devel/2020-player, devel/ffmpeg-resync, fixes/0.28, fixes/29, fixes/30, fixes/31, github-templates, master
Children:
996f652f0
Parents:
fe9bbb9de2
git-author:
Stuart Morgan <smorgan@…> (10/01/13 14:37:29)
git-committer:
Stuart Morgan <smorgan@…> (10/01/13 16:22:02)
Message:

Move the Gallery thumb generator thread class to libmythmetadata so it can be used by mythbackend and mythmediaserver

Location:
mythtv
Files:
9 edited
2 moved

Legend:

Unmodified
Added
Removed

  • mythtv/libs/libmythbase/mythversion.h

    rfe9bbb9de2 r549fb22e17  
    1313/// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
    1414/// libmythui class methods in exported headers.
    15 #define MYTH_BINARY_VERSION "0.28.20130930-1"
     15#define MYTH_BINARY_VERSION "0.28.20131001-1"
    1616
    1717/** \brief Increment this whenever the MythTV network protocol changes.

  • mythtv/libs/libmythmetadata/imagethumbgenthread.cpp

    rfe9bbb9de2 r549fb22e17  
    1212#include "imagemetadata.h"
    1313#include "imageutils.h"
    14 #include "gallerythumbgenthread.h"
     14#include "imagethumbgenthread.h"
    1515
    1616// FIXME: This should be on the backend only, not the frontend!
    1717
    18 /** \fn     GalleryThumbGenThread::GalleryThumbGenThread()
     18/** \fn     ImageThumbGenThread::ImageThumbGenThread()
    1919 *  \brief  Constructor
    2020 *  \return void
    2121 */
    22 GalleryThumbGenThread::GalleryThumbGenThread()
    23         :   m_fileHelper(new GalleryFileHelper()),
    24             m_dbHelper(new GalleryDatabaseHelper()),
    25             m_width(0), m_height(0),
     22ImageThumbGenThread::ImageThumbGenThread()
     23        :   m_width(0), m_height(0),
    2624            m_pause(false), m_fileListSize(0)
    2725{
    2826    QString sgName = IMAGE_STORAGE_GROUP;
    2927    m_storageGroup = StorageGroup(sgName, gCoreContext->GetHostName());
    30 }
    31 
    32 
    33 
    34 /** \fn     GalleryThumbGenThread::~GalleryThumbGenThread()
     28
     29    if (!gCoreContext->IsMasterBackend())
     30        LOG(VB_GENERAL, LOG_ERR, "ImageThumbGenThread MUST be run on the master backend");
     31}
     32
     33
     34
     35/** \fn     ImageThumbGenThread::~ImageThumbGenThread()
    3536 *  \brief  Destructor
    3637 *  \return void
    3738 */
    38 GalleryThumbGenThread::~GalleryThumbGenThread()
     39ImageThumbGenThread::~ImageThumbGenThread()
    3940{
    4041    cancel();
    4142    wait();
    42 
    43     if (m_fileHelper)
    44     {
    45         delete m_fileHelper;
    46         m_fileHelper = NULL;
    47     }
    48 
    49     if (m_dbHelper)
    50     {
    51         delete m_dbHelper;
    52         m_dbHelper = NULL;
    53     }
    54 }
    55 
    56 
    57 
    58 /** \fn     GalleryThumbGenThread::run()
     43}
     44
     45
     46
     47/** \fn     ImageThumbGenThread::run()
    5948 *  \brief  Called when the thread starts. Tries to generate
    6049 *          thumbnails from the file list until its empty or aborted.
    6150 *  \return void
    6251 */
    63 void GalleryThumbGenThread::run()
     52void ImageThumbGenThread::run()
    6453{
    6554    volatile bool exit = false;
    … …  
    113102
    114103
    115 /** \fn     GalleryThumbGenThread::CreateImageThumbnail(ImageMetadata *, int)
     104/** \fn     ImageThumbGenThread::CreateImageThumbnail(ImageMetadata *, int)
    116105 *  \brief  Creates a thumbnail with the correct size and rotation
    117106 *  \param  im The thumbnail details
    … …  
    119108 *  \return void
    120109 */
    121 void GalleryThumbGenThread::CreateImageThumbnail(ImageMetadata *im, int id)
     110void ImageThumbGenThread::CreateImageThumbnail(ImageMetadata *im, int id)
    122111{
    123112    if (QFile(im->m_thumbFileNameList->at(id)).exists())
    … …  
    199188
    200189
    201 /** \fn     GalleryThumbGenThread::CreateVideoThumbnail(ImageMetadata *)
     190/** \fn     ImageThumbGenThread::CreateVideoThumbnail(ImageMetadata *)
    202191 *  \brief  Creates a video preview image with the correct size
    203192 *  \param  im The thumbnail details
    204193 *  \return void
    205194 */
    206 void GalleryThumbGenThread::CreateVideoThumbnail(ImageMetadata *im)
     195void ImageThumbGenThread::CreateVideoThumbnail(ImageMetadata *im)
    207196{
    208197    if (QFile(im->m_thumbFileNameList->at(0)).exists())
    … …  
    243232
    244233
    245 /** \fn     GalleryThumbGenThread::Resize(QImage)
     234/** \fn     ImageThumbGenThread::Resize(QImage)
    246235 *  \brief  Resizes the thumbnail to prevent black areas
    247236 *          around the image when its shown in a widget.
    … …  
    249238 *  \return void
    250239 */
    251 void GalleryThumbGenThread::Resize(QImage &image)
     240void ImageThumbGenThread::Resize(QImage &image)
    252241{
    253242    // If the factor of the width to height of the image is smaller
    … …  
    280269
    281270
    282 /** \fn     GalleryThumbGenThread::AddToThumbnailList(ImageMetadata *)
     271/** \fn     ImageThumbGenThread::AddToThumbnailList(ImageMetadata *)
    283272 *  \brief  Adds a file to the thumbnail list
    284273 *  \param  im The file information
    285274 *  \return void
    286275 */
    287 void GalleryThumbGenThread::AddToThumbnailList(ImageMetadata *im)
     276void ImageThumbGenThread::AddToThumbnailList(ImageMetadata *im)
    288277{
    289278    if (!im)
    … …  
    298287
    299288
    300 /** \fn     GalleryThumbGenThread::RecreateThumbnail(ImageMetadata *)
     289/** \fn     ImageThumbGenThread::RecreateThumbnail(ImageMetadata *)
    301290 *  \brief  Deletes the old thumbnail and creates a new one
    302291 *  \param  im The thumbnail information
    303292 *  \return void
    304293 */
    305 void GalleryThumbGenThread::RecreateThumbnail(ImageMetadata *im)
     294void ImageThumbGenThread::RecreateThumbnail(ImageMetadata *im)
    306295{
    307296    if (!im)
    … …  
    319308
    320309
    321 /** \fn     GalleryThumbGenThread::cancel()
     310/** \fn     ImageThumbGenThread::cancel()
    322311 *  \brief  Clears the thumbnail list so that the thread can exit.
    323312 *  \return void
    324313 */
    325 void GalleryThumbGenThread::cancel()
     314void ImageThumbGenThread::cancel()
    326315{
    327316    m_mutex.lock();
    … …  
    335324
    336325
    337 /** \fn     GalleryThumbGenThread::Pause()
     326/** \fn     ImageThumbGenThread::Pause()
    338327 *  \brief  Pauses the thumbnail generation
    339328 *  \return void
    340329 */
    341 void GalleryThumbGenThread::Pause()
     330void ImageThumbGenThread::Pause()
    342331{
    343332    m_pause = true;
    … …  
    346335
    347336
    348 /** \fn     GalleryThumbGenThread::Resume()
     337/** \fn     ImageThumbGenThread::Resume()
    349338 *  \brief  Resumes the thumbnail generation
    350339 *  \return void
    351340 */
    352 void GalleryThumbGenThread::Resume()
     341void ImageThumbGenThread::Resume()
    353342{
    354343    m_condition.wakeAll();
    … …  
    358347
    359348
    360 /** \fn     GalleryThumbGenThread::SetThumbnailSize(int, int)
     349/** \fn     ImageThumbGenThread::SetThumbnailSize(int, int)
    361350 *  \brief  Saves and specifies the size of the thumbnails.
    362351 *  \return void
    363352 */
    364 void GalleryThumbGenThread::SetThumbnailSize(int width, int height)
     353void ImageThumbGenThread::SetThumbnailSize(int width, int height)
    365354{
    366355    if (width > 0)

  • mythtv/libs/libmythmetadata/imagethumbgenthread.h

    rfe9bbb9de2 r549fb22e17  
    1010#include "imagemetadata.h"
    1111#include "storagegroup.h"
    12 
    13 #include "galleryfilehelper.h"
    14 #include "gallerydatabasehelper.h"
     12#include "mythmetaexp.h"
    1513
    1614
    17 
    18 class GalleryThumbGenThread : public QThread
     15class META_PUBLIC ImageThumbGenThread : public QThread
    1916{
    2017    Q_OBJECT
    2118
    2219public:
    23     GalleryThumbGenThread();
    24     ~GalleryThumbGenThread();
     20    ImageThumbGenThread();
     21    ~ImageThumbGenThread();
    2522
    2623    void cancel();
    … …  
    4946    QList<ImageMetadata *>    m_fileList;
    5047    QMutex              m_mutex;
    51     GalleryFileHelper         *m_fileHelper;
    52     GalleryDatabaseHelper     *m_dbHelper;
    5348
    5449    int m_width;

  • mythtv/libs/libmythmetadata/libmythmetadata.pro

    rfe9bbb9de2 r549fb22e17  
    2727HEADERS += metaiowavpack.h metaioid3.h metaiooggvorbis.h
    2828HEADERS += imagemetadata.h imageutils.h imagescan.h imagescanthread.h
     29HEADERS += imagethumbgenthread.h
    2930
    3031SOURCES += cleanup.cpp  dbaccess.cpp  dirscan.cpp  globals.cpp
    … …  
    3839SOURCES += metaiowavpack.cpp metaioid3.cpp metaiooggvorbis.cpp
    3940SOURCES += imagemetadata.cpp imageutils.cpp imagescan.cpp imagescanthread.cpp
     41SOURCES += imagethumbgenthread.cpp
    4042
    4143INCLUDEPATH += ../libmythbase ../libmythtv
    … …  
    98100inc.files += metaiowavpack.h metaioid3.h metaiooggvorbis.h
    99101inc.files += imagemetadata.h imageutils.h imagescan.h imagescanthread.h
     102inc.files += imagethumbgenthread.h
    100103
    101104INSTALLS += inc

  • mythtv/programs/mythfrontend/galleryconfig.cpp

    rfe9bbb9de2 r549fb22e17  
     1
     2#include "galleryconfig.h"
     3
    14// Qt headers
    25
    … …  
    1215#include "mythscreentype.h"
    1316
    14 #include "galleryconfig.h"
    1517#include "gallerydatabasehelper.h"
    1618#include "gallerytypedefs.h"

  • mythtv/programs/mythfrontend/galleryfilehelper.cpp

    rfe9bbb9de2 r549fb22e17  
     1
     2#include "galleryfilehelper.h"
     3
    14// Qt headers
    25#include <QNetworkAccessManager>
    … …  
    1417#include "remoteutil.h"
    1518
    16 #include "galleryfilehelper.h"
    1719#include "gallerytypedefs.h"
    1820

  • mythtv/programs/mythfrontend/galleryview.cpp

    rfe9bbb9de2 r549fb22e17  
     1
     2#include "galleryview.h"
     3
    14// Qt headers
    25
    … …  
    47#include "mythcontext.h"
    58
    6 #include "galleryview.h"
    79#include "galleryconfig.h"
     10#include "gallerytypedefs.h"
    811#include "imagescan.h"
    912

  • mythtv/programs/mythfrontend/galleryviewhelper.cpp

    rfe9bbb9de2 r549fb22e17  
     1
     2#include "galleryviewhelper.h"
     3
    14// Qt headers
    25#include <QFile>
    … …  
    710#include "imageutils.h"
    811
    9 #include "galleryviewhelper.h"
    10 
    11 
    12 
    1312/** \fn     GalleryViewHelper::GalleryViewHelper(MythScreenType *)
    1413 *  \brief  Constructor
    … …  
    2322
    2423    m_dbHelper = new GalleryDatabaseHelper();
    25     m_thumbGenThread = new GalleryThumbGenThread();
     24    m_thumbGenThread = new ImageThumbGenThread();
    2625    m_fileHelper  = new GalleryFileHelper();
    2726

  • mythtv/programs/mythfrontend/galleryviewhelper.h

    rfe9bbb9de2 r549fb22e17  
    1010#include "mythgenerictree.h"
    1111#include "imagemetadata.h"
     12#include "imagethumbgenthread.h"
    1213
    13 #include "gallerythumbgenthread.h"
    1414#include "galleryfilehelper.h"
    15 
     15#include "gallerydatabasehelper.h"
    1616
    1717
    … …  
    2525
    2626    MythGenericTree         *m_currentNode;
    27     GalleryThumbGenThread   *m_thumbGenThread;
     27    ImageThumbGenThread   *m_thumbGenThread;
    2828
    2929    QStringList m_sgDirList;

  • mythtv/programs/mythfrontend/gallerywidget.cpp

    rfe9bbb9de2 r549fb22e17  
     1
     2#include "gallerywidget.h"
     3
    14// Qt headers
    25#include <QByteArray>
    … …  
    710#include "mythmainwindow.h"
    811
    9 #include "gallerywidget.h"
    10 
     12#include "imagethumbgenthread.h"
    1113
    1214

  • mythtv/programs/mythfrontend/mythfrontend.pro

    rfe9bbb9de2 r549fb22e17  
    5151HEADERS += galleryconfig.h              galleryfilehelper.h
    5252HEADERS += gallerydatabasehelper.h      gallerywidget.h
    53 HEADERS += gallerythumbgenthread.h      gallerytypedefs.h
     53HEADERS += gallerytypedefs.h
    5454
    5555SOURCES += main.cpp playbackbox.cpp viewscheduled.cpp audiogeneralsettings.cpp
    … …  
    7575SOURCES += galleryview.cpp              gallerywidget.cpp
    7676SOURCES += galleryviewhelper.cpp        galleryconfig.cpp
    77 SOURCES += gallerydatabasehelper.cpp    gallerythumbgenthread.cpp
    78 SOURCES += galleryfilehelper.cpp
     77SOURCES += gallerydatabasehelper.cpp    galleryfilehelper.cpp
    7978
    8079HEADERS += serviceHosts/frontendServiceHost.h
Note: See TracChangeset for help on using the changeset viewer.