From 86379878cf118f3e421a35afefb97b860793c51c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Wed, 21 Dec 2016 15:43:50 +0100
Subject: [PATCH] Thumbnailer: Reduce the amount of shared_ptr copies

---
 src/metadata_services/vlc/VLCThumbnailer.cpp | 24 ++++++++++----------
 src/metadata_services/vlc/VLCThumbnailer.h   |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/metadata_services/vlc/VLCThumbnailer.cpp b/src/metadata_services/vlc/VLCThumbnailer.cpp
index 22d4c55a9..6e0e6de23 100644
--- a/src/metadata_services/vlc/VLCThumbnailer.cpp
+++ b/src/metadata_services/vlc/VLCThumbnailer.cpp
@@ -70,14 +70,14 @@ File::ParserStep VLCThumbnailer::step() const
 
 parser::Task::Status VLCThumbnailer::run( parser::Task& task )
 {
-    auto media = task.media;
-    auto file = task.file;
+    auto media = task.media.get();
+    auto file = task.file.get();
 
     if ( media->type() == IMedia::Type::Audio )
     {
         // There's no point in generating a thumbnail for a non-video media.
-        task.file->markStepCompleted( File::ParserStep::Thumbnailer );
-        task.file->saveParserStep();
+        file->markStepCompleted( File::ParserStep::Thumbnailer );
+        file->saveParserStep();
         return parser::Task::Status::Success;
     }
 
@@ -112,10 +112,10 @@ parser::Task::Status VLCThumbnailer::run( parser::Task& task )
     if ( res != parser::Task::Status::Success )
     {
         // If the media became an audio file, it's not an error
-        if ( task.media->type() == Media::Type::Audio )
+        if ( media->type() == Media::Type::Audio )
         {
-            task.file->markStepCompleted( File::ParserStep::Thumbnailer );
-            task.file->saveParserStep();
+            file->markStepCompleted( File::ParserStep::Thumbnailer );
+            file->saveParserStep();
             LOG_INFO( file->mrl(), " type has changed to Audio. Skipping thumbnail generation" );
             return parser::Task::Status::Success;
         }
@@ -137,8 +137,9 @@ parser::Task::Status VLCThumbnailer::run( parser::Task& task )
     res = takeThumbnail( media, file, mp );
     if ( res != parser::Task::Status::Success )
         return res;
-    task.file->markStepCompleted( File::ParserStep::Thumbnailer );
-    task.file->saveParserStep();
+    file->markStepCompleted( File::ParserStep::Thumbnailer );
+    file->saveParserStep();
+    m_notifier->notifyMediaModification( task.media );
     return parser::Task::Status::Success;
 }
 
@@ -261,7 +262,7 @@ void VLCThumbnailer::setupVout( VLC::MediaPlayer& mp )
     );
 }
 
-parser::Task::Status VLCThumbnailer::takeThumbnail( std::shared_ptr<Media> media, std::shared_ptr<File> file, VLC::MediaPlayer &mp )
+parser::Task::Status VLCThumbnailer::takeThumbnail( Media* media, File* file, VLC::MediaPlayer &mp )
 {
     // lock, signal that we want a thumbnail, and wait.
     {
@@ -281,7 +282,7 @@ parser::Task::Status VLCThumbnailer::takeThumbnail( std::shared_ptr<Media> media
     return compress( media, file );
 }
 
-parser::Task::Status VLCThumbnailer::compress( std::shared_ptr<Media> media, std::shared_ptr<File> file )
+parser::Task::Status VLCThumbnailer::compress( Media* media, File* file )
 {
     auto path = m_ml->thumbnailPath();
     path += "/";
@@ -303,7 +304,6 @@ parser::Task::Status VLCThumbnailer::compress( std::shared_ptr<Media> media, std
     if ( file->saveParserStep() == false )
         return parser::Task::Status::Fatal;
     t->commit();
-    m_notifier->notifyMediaModification( media );
     return parser::Task::Status::Success;
 }
 
diff --git a/src/metadata_services/vlc/VLCThumbnailer.h b/src/metadata_services/vlc/VLCThumbnailer.h
index ddba05ff6..a793e926d 100644
--- a/src/metadata_services/vlc/VLCThumbnailer.h
+++ b/src/metadata_services/vlc/VLCThumbnailer.h
@@ -45,8 +45,8 @@ private:
     parser::Task::Status startPlayback( parser::Task& task, VLC::MediaPlayer& mp );
     parser::Task::Status seekAhead( VLC::MediaPlayer &mp );
     void setupVout( VLC::MediaPlayer &mp );
-    parser::Task::Status takeThumbnail( std::shared_ptr<Media> media, std::shared_ptr<File> file, VLC::MediaPlayer &mp );
-    parser::Task::Status compress( std::shared_ptr<Media> media, std::shared_ptr<File> file );
+    parser::Task::Status takeThumbnail( Media* media, File* file, VLC::MediaPlayer &mp );
+    parser::Task::Status compress( Media* media, File* file );
 
     virtual const char* name() const override;
     virtual uint8_t nbThreads() const override;
-- 
GitLab