From c7ea710267a185beca339b6e7afb2eab7e7c3135 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Wed, 16 Jun 2010 06:19:49 +0000
Subject: [PATCH] Use VideoContext::JumpToTime where appropriate

Originally committed to SVN as r4522.
---
 aegisub/src/base_grid.cpp                | 2 +-
 aegisub/src/dialog_styling_assistant.cpp | 3 +--
 aegisub/src/subs_edit_box.cpp            | 5 ++---
 aegisub/src/subs_grid.cpp                | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp
index e294f4638..7375557d4 100644
--- a/aegisub/src/base_grid.cpp
+++ b/aegisub/src/base_grid.cpp
@@ -716,7 +716,7 @@ void BaseGrid::OnMouseEvent(wxMouseEvent &event) {
 		// Normal click
 		if ((click || dclick) && !shift && !ctrl && !alt) {
 			editBox->SetToLine(row);
-			if (dclick) VideoContext::Get()->JumpToFrame(VFR_Output.GetFrameAtTime(GetDialogue(row)->Start.GetMS(),true));
+			if (dclick) VideoContext::Get()->JumpToTime(GetDialogue(row)->Start.GetMS());
 			SelectRow(row,false);
 			parentFrame->UpdateToolbar();
 			lastRow = row;
diff --git a/aegisub/src/dialog_styling_assistant.cpp b/aegisub/src/dialog_styling_assistant.cpp
index 400cded63..a22947dc1 100644
--- a/aegisub/src/dialog_styling_assistant.cpp
+++ b/aegisub/src/dialog_styling_assistant.cpp
@@ -56,7 +56,6 @@
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "utils.h"
-#include "vfr.h"
 #include "video_context.h"
 #include "video_display.h"
 
@@ -214,7 +213,7 @@ void DialogStyling::JumpToLine(int n) {
 	grid->editBox->SetToLine(linen);
 
 	// Update display
-	if (PreviewCheck->IsChecked()) VideoContext::Get()->JumpToFrame(VFR_Output.GetFrameAtTime(line->Start.GetMS(),true));
+	if (PreviewCheck->IsChecked()) VideoContext::Get()->JumpToTime(line->Start.GetMS());
 }
 
 
diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp
index 0b7416ba2..de7786b43 100644
--- a/aegisub/src/subs_edit_box.cpp
+++ b/aegisub/src/subs_edit_box.cpp
@@ -63,7 +63,6 @@
 #include "tooltip_manager.h"
 #include "utils.h"
 #include "validators.h"
-#include "vfr.h"
 #include "video_context.h"
 #include "video_display.h"
 
@@ -377,7 +376,7 @@ void SubsEditBox::SetToLine(int n,bool weak) {
 		if (sync) {
 			VideoContext::Get()->Stop();
 			AssDialogue *cur = grid->GetDialogue(n);
-			if (cur) VideoContext::Get()->JumpToFrame(VFR_Output.GetFrameAtTime(cur->Start.GetMS(),true));
+			if (cur) VideoContext::Get()->JumpToTime(cur->Start.GetMS());
 		}
 	}
 
@@ -592,7 +591,7 @@ void SubsEditBox::SetControlsState (bool state) {
 /// @brief Disables or enables frame timing 
 ///
 void SubsEditBox::UpdateFrameTiming () {
-	if (VFR_Output.IsLoaded()) ByFrame->Enable(enabled);
+	if (VideoContext::Get()->IsLoaded()) ByFrame->Enable(enabled);
 	else {
 		ByFrame->Enable(false);
 		ByTime->SetValue(true);
diff --git a/aegisub/src/subs_grid.cpp b/aegisub/src/subs_grid.cpp
index bd5bd4f65..1c3feb8fb 100644
--- a/aegisub/src/subs_grid.cpp
+++ b/aegisub/src/subs_grid.cpp
@@ -1547,7 +1547,7 @@ void SubtitlesGrid::SetVideoToSubs(bool start) {
 	AssDialogue *cur = GetDialogue(sel[0]);
 	if (cur) {
 		if (start) 
-			VideoContext::Get()->JumpToFrame(VFR_Output.GetFrameAtTime(cur->Start.GetMS(),true));
+			VideoContext::Get()->JumpToTime(cur->Start.GetMS());
 		else 
 			VideoContext::Get()->JumpToFrame(VFR_Output.GetFrameAtTime(cur->End.GetMS(),false));
 	}