WIP A/B playback sync

darbyjohnston · Feb 26, 2024 · 890b36e · 890b36e
1 parent 4d0f016
commit 890b36e
Show file tree

Hide file tree

Showing 17 changed files with 262 additions and 435 deletions.
diff --git a/examples/panorama-qtwidget/PanoramaTimelineViewport.cpp b/examples/panorama-qtwidget/PanoramaTimelineViewport.cpp
@@ -53,32 +53,32 @@ namespace tl
                 update();
             }
 
-            void PanoramaTimelineViewport::setTimelinePlayer(qt::TimelinePlayer* timelinePlayer)
+            void PanoramaTimelineViewport::setPlayer(const QSharedPointer<qt::TimelinePlayer>& player)
             {
-                _videoData = timeline::VideoData();
-                if (_timelinePlayer)
+                if (_player)
                 {
                     disconnect(
-                        _timelinePlayer,
-                        SIGNAL(currentVideoChanged(const tl::timeline::VideoData&)),
+                        _player.get(),
+                        SIGNAL(currentVideoChanged(const std::vector<tl::timeline::VideoData>&)),
                         this,
-                        SLOT(_currentVideoCallback(const tl::timeline::VideoData&)));
+                        SLOT(_currentVideoCallback(const std::vector<tl::timeline::VideoData>&)));
                 }
-                _timelinePlayer = timelinePlayer;
-                if (_timelinePlayer)
+                _player = player;
+                _videoData.clear();
+                if (_player)
                 {
-                    const auto& ioInfo = _timelinePlayer->ioInfo();
+                    const auto& ioInfo = _player->ioInfo();
                     _videoSize = !ioInfo.video.empty() ? ioInfo.video[0].size : image::Size();
-                    _videoData = _timelinePlayer->currentVideo();
+                    _videoData = _player->currentVideo();
                     connect(
-                        _timelinePlayer,
-                        SIGNAL(currentVideoChanged(const tl::timeline::VideoData&)),
-                        SLOT(_currentVideoCallback(const tl::timeline::VideoData&)));
+                        _player.get(),
+                        SIGNAL(currentVideoChanged(const std::vector<tl::timeline::VideoData>&)),
+                        SLOT(_currentVideoCallback(const std::vector<tl::timeline::VideoData>&)));
                 }
                 update();
             }
 
-            void PanoramaTimelineViewport::_currentVideoCallback(const timeline::VideoData& value)
+            void PanoramaTimelineViewport::_currentVideoCallback(const std::vector<timeline::VideoData>& value)
             {
                 _videoData = value;
                 update();

diff --git a/examples/panorama-qtwidget/PanoramaTimelineViewport.h b/examples/panorama-qtwidget/PanoramaTimelineViewport.h
@@ -46,10 +46,10 @@ namespace tl
                 void setImageOptions(const timeline::ImageOptions&);
 
                 //! Set the timeline player.
-                void setTimelinePlayer(qt::TimelinePlayer*);
+                void setPlayer(const QSharedPointer<qt::TimelinePlayer>&);
 
             private Q_SLOTS:
-                void _currentVideoCallback(const tl::timeline::VideoData&);
+                void _currentVideoCallback(const std::vector<tl::timeline::VideoData>&);
 
             protected:
                 void initializeGL() override;
@@ -63,9 +63,9 @@ namespace tl
                 timeline::OCIOOptions _ocioOptions;
                 timeline::LUTOptions _lutOptions;
                 timeline::ImageOptions _imageOptions;
-                qt::TimelinePlayer* _timelinePlayer = nullptr;
+                QSharedPointer<qt::TimelinePlayer> _player;
                 image::Size _videoSize;
-                timeline::VideoData _videoData;
+                std::vector<timeline::VideoData> _videoData;
                 math::Vector2f _cameraRotation;
                 float _cameraFOV = 45.F;
                 geom::TriangleMesh3 _sphereMesh;

diff --git a/examples/panorama-qtwidget/main.cpp b/examples/panorama-qtwidget/main.cpp
@@ -45,19 +45,19 @@ int main(int argc, char* argv[])
         auto timeline = tl::timeline::Timeline::create(argv[1], context);
 
         // Create the timeline player.
-        QScopedPointer<tl::qt::TimelinePlayer> timelinePlayer(
+        QSharedPointer<tl::qt::TimelinePlayer> player(
             new tl::qt::TimelinePlayer(
                 tl::timeline::Player::create(timeline, context),
                 context));
 
         // Create the panorama timeline viewport.
         auto timelineViewport = new tl::examples::panorama_qtwidget::PanoramaTimelineViewport(context);
-        timelineViewport->setTimelinePlayer(timelinePlayer.get());
+        timelineViewport->setPlayer(player);
         timelineViewport->setAttribute(Qt::WA_DeleteOnClose);
         timelineViewport->show();
 
         // Start playback.
-        timelinePlayer->setPlayback(tl::timeline::Playback::Forward);
+        player->setPlayback(tl::timeline::Playback::Forward);
 
         // Start the application.
         r = app.exec();

diff --git a/examples/player-qtwidget/player-qtwidget.cpp b/examples/player-qtwidget/player-qtwidget.cpp
@@ -44,19 +44,19 @@ int main(int argc, char* argv[])
         auto timeline = tl::timeline::Timeline::create(argv[1], context);
 
         // Create the timeline player.
-        QSharedPointer<tl::qt::TimelinePlayer> timelinePlayer(
+        QSharedPointer<tl::qt::TimelinePlayer> player(
             new tl::qt::TimelinePlayer(
                 tl::timeline::Player::create(timeline, context),
                 context));
 
         // Create the timeline viewport.
         auto timelineViewport = new tl::qtwidget::TimelineViewport(context);
-        timelineViewport->setTimelinePlayers({ timelinePlayer });
+        timelineViewport->setPlayer(player);
         timelineViewport->setAttribute(Qt::WA_DeleteOnClose);
         timelineViewport->show();
 
         // Start playback.
-        timelinePlayer->setPlayback(tl::timeline::Playback::Forward);
+        player->setPlayback(tl::timeline::Playback::Forward);
 
         // Start the application.
         r = app.exec();