Only draw video position audio marker if video is loaded

Author: arch1t3cht

src/audio_marker.cpp

@@ -96,8 +96,8 @@ class VideoPositionMarker final : public AudioMarker {
 };
 
 VideoPositionMarkerProvider::VideoPositionMarkerProvider(agi::Context *c)
-: vc(c->videoController.get())
-, video_seek_slot(vc->AddSeekListener(&VideoPositionMarkerProvider::Update, this))
+: c(c)
+, video_seek_slot(c->videoController->AddSeekListener(&VideoPositionMarkerProvider::Update, this))
 , enable_opt_changed_slot(OPT_SUB("Audio/Display/Draw/Video Position", &VideoPositionMarkerProvider::OptChanged, this))
 {
 	OptChanged(*OPT_GET("Audio/Display/Draw/Video Position"));
@@ -106,7 +106,7 @@ VideoPositionMarkerProvider::VideoPositionMarkerProvider(agi::Context *c)
 VideoPositionMarkerProvider::~VideoPositionMarkerProvider() { }
 
 void VideoPositionMarkerProvider::SetPosition(int frame_number) {
-	marker->SetPosition(vc->TimeAtFrame(frame_number));
+	marker->SetPosition(c->videoController->TimeAtFrame(frame_number));
 }
 
 void VideoPositionMarkerProvider::Update(int frame_number) {
@@ -118,7 +118,7 @@ void VideoPositionMarkerProvider::OptChanged(agi::OptionValue const& opt) {
 	if (opt.GetBool()) {
 		video_seek_slot.Unblock();
 		marker = std::make_unique<VideoPositionMarker>();
-		SetPosition(vc->GetFrameN());
+		SetPosition(c->videoController->GetFrameN());
 	}
 	else {
 		video_seek_slot.Block();
@@ -127,6 +127,9 @@ void VideoPositionMarkerProvider::OptChanged(agi::OptionValue const& opt) {
 }
 
 void VideoPositionMarkerProvider::GetMarkers(const TimeRange &range, AudioMarkerVector &out) const {
+	if (!c->project->VideoProvider())
+		return;
+
 	if (marker && range.contains(*marker))
 		out.push_back(marker.get());
 }

src/audio_marker.h

@@ -27,7 +27,6 @@
 class AudioMarkerKeyframe;
 class Pen;
 class Project;
-class VideoController;
 class VideoPositionMarker;
 class wxPen;
 
@@ -140,7 +139,7 @@ class AudioMarkerProviderKeyframes final : public AudioMarkerProvider {
 
 /// Marker provider for the current video playback position
 class VideoPositionMarkerProvider final : public AudioMarkerProvider {
-	VideoController *vc;
+	agi::Context *c;
 
 	std::unique_ptr<VideoPositionMarker> marker;