Merge pull request #176 from kenmcgaugh/feature_custom_thumbnails

Feature to allow for custom thumbnail images.

Author: tedwaine

include/xstudio/media/enums.hpp

@@ -4,7 +4,7 @@
 namespace xstudio {
 namespace media {
 
-    typedef enum { MT_IMAGE = 0x1L, MT_AUDIO = 0x2L } MediaType;
+    typedef enum { MT_IMAGE = 0x1L, MT_AUDIO = 0x2L, MT_THUMBNAIL = 0x3L } MediaType;
     typedef enum {
         MS_ONLINE      = 0x0L,
         MS_MISSING     = 0x01L,

include/xstudio/media/media.hpp

@@ -36,6 +36,9 @@ namespace media {
         case MT_AUDIO:
             str = "Audio";
             break;
+        case MT_THUMBNAIL:
+            str = "Thumbnail";
+            break;
         }
         return str;
     }
@@ -403,7 +406,16 @@ namespace media {
         bool set_current(const utility::Uuid &uuid, const MediaType mt = MediaType::MT_IMAGE);
         [[nodiscard]] bool empty() const { return media_sources_.empty(); }
         [[nodiscard]] utility::Uuid current(const MediaType mt = MediaType::MT_IMAGE) const {
-            return mt == MediaType::MT_IMAGE ? current_image_source_ : current_audio_source_;
+            switch (mt) {
+            case MediaType::MT_IMAGE:
+                return current_image_source_;
+            case MediaType::MT_AUDIO:
+                return current_audio_source_;
+            case MediaType::MT_THUMBNAIL:
+                return current_thumbnail_source_;
+            default:
+                return utility::Uuid();
+            }
         }
         [[nodiscard]] const std::list<utility::Uuid> &media_sources() const {
             return media_sources_;
@@ -419,6 +431,7 @@ namespace media {
         // will need extending.., tagging ?
         utility::Uuid current_image_source_;
         utility::Uuid current_audio_source_;
+        utility::Uuid current_thumbnail_source_;
         std::string flag_{"#00000000"};
         std::string flag_text_{""};
         std::list<utility::Uuid> media_sources_;

src/media/src/media.cpp

@@ -74,17 +74,26 @@ void Media::remove_media_source(const Uuid &uuid) {
         else
             current_audio_source_ = Uuid();
     }
+    if (uuid == current_thumbnail_source_)
+        current_thumbnail_source_ = Uuid();
 }
 
 bool Media::set_current(const Uuid &uuid, const MediaType mt) {
     if (std::find(media_sources_.begin(), media_sources_.end(), uuid) !=
         std::end(media_sources_)) {
-        if (mt == MediaType::MT_IMAGE) {
+        switch (mt) {
+        case MediaType::MT_IMAGE:
             current_image_source_ = uuid;
-        } else {
+            return true;
+        case MediaType::MT_AUDIO:
             current_audio_source_ = uuid;
+            return true;
+        case MediaType::MT_THUMBNAIL:
+            current_thumbnail_source_ = uuid;
+            return true;
+        default:
+            return false;
         }
-        return true;
     }
     return false;
 }

src/media/src/media_actor.cpp

@@ -579,12 +579,15 @@ caf::message_handler MediaActor::message_handler() {
 
         [=](media_reader::get_thumbnail_atom,
             float position) -> result<thumbnail::ThumbnailBufferPtr> {
-            if (base_.empty() or not media_sources_.count(base_.current(MT_IMAGE)))
+            auto tu = base_.current(MT_THUMBNAIL);
+            if (not tu)
+                tu = base_.current(MT_IMAGE);
+            if (base_.empty() or not tu)
                 return make_error(xstudio_error::error, "No MediaSources");
 
             auto rp = make_response_promise<thumbnail::ThumbnailBufferPtr>();
             mail(media_reader::get_thumbnail_atom_v, position)
-                .request(media_sources_.at(base_.current(media::MT_IMAGE)), infinite)
+                .request(media_sources_.at(tu), infinite)
                 .then(
                     [=](thumbnail::ThumbnailBufferPtr &buf) mutable {
                         rp.deliver(buf);
@@ -959,21 +962,22 @@ caf::message_handler MediaActor::message_handler() {
             auto rp =
                 make_response_promise<std::vector<std::pair<utility::Uuid, std::string>>>();
 
-            // make a vector of our MediaSourceActor(s)
-            auto sources = map_value_to_vec(media_sources_);
+            // get the uuid of the current thumbnail, if set
+            const auto tu = base_.current(MT_THUMBNAIL);
 
             // here we remove sources that don't contain any streams matching 'mt'
             // i.e. mt = MT_IMAGE and a source only provides audio streams then
             // we exclude it from 'sources'
+            auto sources = std::vector<caf::actor>();
+            sources.reserve(media_sources_.size());
             caf::scoped_actor sys(system());
-            auto p = sources.begin();
-            while (p != sources.end()) {
+            for (const auto &[u, a] : media_sources_) {
+                if (u == tu)
+                    continue;
                 auto stream_details = request_receive<std::vector<ContainerDetail>>(
-                    *sys, *p, utility::detail_atom_v, mt);
-                if (stream_details.empty())
-                    p = sources.erase(p);
-                else
-                    p++;
+                    *sys, a, utility::detail_atom_v, mt);
+                if (not stream_details.empty() and u != tu)
+                    sources.push_back(a);
             }
 
             if (sources.empty()) {
@@ -2071,6 +2075,8 @@ void MediaActor::duplicate(
                 for (const auto &i : base_.media_sources())
                     new_media_srcs.push_back(dmedia_srcs_map[i]);
 
+                auto tu = base_.current(MT_THUMBNAIL);
+
                 // bulk add srcs.
                 mail(add_media_source_atom_v, new_media_srcs)
                     .request(actor, infinite)
@@ -2087,6 +2093,10 @@ void MediaActor::duplicate(
                                 .request(actor, infinite)
                                 .then(
                                     [=](const bool) mutable {
+                                        if (tu)
+                                            anon_mail(current_media_source_atom_v,
+                                                      dmedia_srcs_map[tu].uuid(), MT_THUMBNAIL)
+                                                .send(actor);
                                         auto uua =
                                             UuidUuidActor(base_.uuid(), UuidActor(uuid, actor));
 

src/ui/qml/session/src/session_model_handler_ui.cpp

@@ -616,7 +616,8 @@ void SessionModel::init(caf::actor_system &_system) {
                     auto plindex = getPlaylistIndex(media_index);
 
                     // trigger model update.
-                    if (mt == media::MediaType::MT_IMAGE) {
+                    if (mt == media::MediaType::MT_IMAGE or
+                        mt == media::MediaType::MT_THUMBNAIL) {
                         receivedData(
                             json(src_str),
                             actorRole,