Make updating the subtitle preview window roughly 50% faster

Originally committed to SVN as r4478.

aegisub/src/ass_file.cpp

@@ -429,8 +429,8 @@ void AssFile::AddLine (wxString data,wxString group,int &version,wxString *outGr
 
 /// @brief Clears contents of assfile 
 void AssFile::Clear () {
-	for (std::list<AssEntry*>::iterator cur=Line.begin();cur != Line.end();cur++) {
+	for (entryIter cur=Line.begin();cur != Line.end();cur++) {
-		if (*cur) delete *cur;
+		delete *cur;
 	}
 	Line.clear();
 

aegisub/src/dialog_style_editor.cpp

@@ -368,7 +368,7 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit
 		SubsPreview = new SubtitlesPreview(this,-1,wxDefaultPosition,wxSize(100,60),wxSUNKEN_BORDER,lagi_wxColour(OPT_GET("Colour/Style Editor/Background/Preview")->GetColour()));
 	
 		SubsPreview->SetToolTip(_("Preview of current style."));
-		SubsPreview->SetStyle(style);
+		SubsPreview->SetStyle(*style);
 		SubsPreview->SetText(PreviewText->GetValue());
 		PreviewText->SetToolTip(_("Text to be used for the preview."));
 		previewButton->SetToolTip(_("Colour of preview background."));
@@ -593,7 +593,7 @@ void DialogStyleEditor::Apply (bool apply,bool close) {
 		}
 
 		// Update preview
-		else if (SubsPreview) SubsPreview->SetStyle(style);
+		else if (SubsPreview) SubsPreview->SetStyle(*style);
 	}
 
 	// Close
@@ -672,7 +672,7 @@ void DialogStyleEditor::OnChooseFont (wxCommandEvent &event) {
 		work->italic = (newfont.GetStyle() == wxFONTSTYLE_ITALIC);
 		work->underline = newfont.GetUnderlined();
 		UpdateWorkStyle();
-		if (SubsPreview) SubsPreview->SetStyle(work);
+		if (SubsPreview) SubsPreview->SetStyle(*work);
 
 		// Comic sans warning
 		if (newfont.GetFaceName() == _T("Comic Sans MS")) {
@@ -694,7 +694,7 @@ void DialogStyleEditor::OnSetColor (int n) {
 		default: throw _T("Internal error in style editor, attempted setting colour id outside range");
 	}
 	modify->SetWXColor(colorButton[n-1]->GetColour());
-	if (SubsPreview) SubsPreview->SetStyle(work);
+	if (SubsPreview) SubsPreview->SetStyle(*work);
 }
 
 /// @brief Child focus change 
@@ -702,7 +702,7 @@ void DialogStyleEditor::OnSetColor (int n) {
 ///
 void DialogStyleEditor::OnChildFocus (wxChildFocusEvent &event) {
 	UpdateWorkStyle();
-	if (SubsPreview) SubsPreview->SetStyle(work);
+	if (SubsPreview) SubsPreview->SetStyle(*work);
 	event.Skip();
 }
 
@@ -731,7 +731,7 @@ void DialogStyleEditor::OnPreviewColourChange (wxCommandEvent &event) {
 void DialogStyleEditor::OnCommandPreviewUpdate (wxCommandEvent &event) {
 	if (!IsShownOnScreen()) return;
 	UpdateWorkStyle();
-	if (SubsPreview) SubsPreview->SetStyle(work);
+	if (SubsPreview) SubsPreview->SetStyle(*work);
 	event.Skip();
 }
 

aegisub/src/subs_preview.cpp

@@ -35,8 +35,6 @@
 ///
 
 
-////////////
-// Includes
 #include "config.h"
 
 #ifndef AGI_PRE
@@ -45,6 +43,7 @@
 #include <wx/msgdlg.h>
 #endif
 
+#include "ass_dialogue.h"
 #include "ass_file.h"
 #include "ass_style.h"
 #include "subs_preview.h"
@@ -62,184 +61,103 @@
 ///
 SubtitlesPreview::SubtitlesPreview(wxWindow *parent,int id,wxPoint pos,wxSize size,int winStyle,wxColour col)
 : wxWindow(parent,id,pos,size,winStyle)
+, backColour(col)
+, subFile(new AssFile)
+, line(new AssDialogue)
+, style(new AssStyle)
 {
-	AssStyle temp;
+	line->Text = "{\\q2}preview";
-	bmp = NULL;
+
-	style = NULL;
+	SetStyle(*style);
-	vid = NULL;
+
-	SetStyle(&temp);
+	subFile->LoadDefault();
-	SetText(_T("preview"));
+	subFile->InsertStyle(style);
+	subFile->Line.push_back(line);
+
 	SetSizeHints(size.GetWidth(), size.GetHeight(), -1, -1);
-	backColour = col;
+	wxSizeEvent evt(size);
+	OnSize(evt);
+	UpdateBitmap();
 }
 
-
-
-/// @brief Destructor 
-///
 SubtitlesPreview::~SubtitlesPreview() {
-	delete bmp;
-	bmp = NULL;
-	delete style;
-	style = NULL;
-	delete vid;
-	vid = NULL;
 }
 
-
+void SubtitlesPreview::SetStyle(AssStyle const& newStyle) {
-
+	*style = newStyle;
-/// @brief Set style 
+	style->name = "Default";
-/// @param _style 
+	style->alignment = 5;
-/// @return 
+	memset(style->Margin, 0, 4 * sizeof(int));
-///
+	style->UpdateData();
-void SubtitlesPreview::SetStyle(AssStyle *_style) {
-	// Prepare style
-	AssStyle *tmpStyle = dynamic_cast<AssStyle*>(_style->Clone());
-	tmpStyle->name = _T("Preview");
-	tmpStyle->alignment = 5;
-	for (int i=0;i<4;i++) tmpStyle->Margin[i] = 0;
-	tmpStyle->UpdateData();
-
-	// See if it's any different from the current
-	if (style) {
-		if (tmpStyle->IsEqualTo(style)) {
-			delete tmpStyle;
-			return;
-		}
-
-		delete style;
-	}
-
-	// Update
-	style = tmpStyle;
 	UpdateBitmap();
 }
 
-
-
-/// @brief Set text 
-/// @param text 
-///
 void SubtitlesPreview::SetText(wxString text) {
-	if (text != showText) {
+	wxString newText = L"{\\q2}" + text;
-		showText = text;
+	if (newText != line->Text) {
+		line->Text = newText;
 		UpdateBitmap();
 	}
 }
 
-
+void SubtitlesPreview::UpdateBitmap() {
-
-/// @brief Update image 
-/// @param w 
-/// @param h 
-/// @return 
-///
-void SubtitlesPreview::UpdateBitmap(int w,int h) {
-	// Visible?
 	if (!IsShownOnScreen()) return;
 
-	// Get size
-	if (w == -1) {
-		w = GetClientSize().GetWidth();
-		h = GetClientSize().GetHeight();
-	}
-
-	// Delete old bmp if needed
-	if (bmp) {
-		if (bmp->GetWidth() != w || bmp->GetHeight() != h) {
-			delete bmp;
-			bmp = NULL;
-		}
-	}
-
-	// Create bitmap
-	if (!bmp) {
-		bmp = new wxBitmap(w,h,-1);
-	}
-
-	// Get AegiVideoFrame
-	if (!vid) vid = new DummyVideoProvider(0.0,10,w,h,backColour,true);
 	AegiVideoFrame frame;
 	frame.CopyFrom(vid->GetFrame(0));
 
-	// Try to get subtitles provider
+	if (provider.get()) {
-	SubtitlesProvider *provider = NULL;
 		try {
-		provider = SubtitlesProviderFactoryManager::GetProvider();
+			provider->LoadSubtitles(subFile.get());
-	} 
-	catch (...) {
-		wxMessageBox(_T("Could not get any subtitles provider for the preview box. Make sure that you have a provider installed."),_T("No subtitles provider"),wxICON_ERROR|wxOK);
-	}
-
-	// Provider OK
-	if (provider) {
-		// Generate subtitles
-		AssFile *subs = new AssFile();
-		subs->LoadDefault();
-		int ver = 1;
-		wxString outGroup;
-		subs->InsertStyle((AssStyle *)style->Clone());
-		subs->SetScriptInfo(_T("PlayResX"),wxString::Format(_T("%i"),w));
-		subs->SetScriptInfo(_T("PlayResY"),wxString::Format(_T("%i"),h));
-		subs->AddLine(_T("Dialogue: 0,0:00:00.00,0:00:05.00,Preview,,0000,0000,0000,,{\\q2}") + showText,_T("[Events]"),ver,&outGroup);
-
-		// Apply subtitles
-		try {
-			provider->LoadSubtitles(subs);
 			provider->DrawSubtitles(frame, 0.1);
 		}
 		catch (...) { }
-		delete provider;
 	}
 
 	// Convert frame to bitmap
-	wxMemoryDC dc(*bmp);
+	*bmp = static_cast<wxBitmap>(frame.GetImage());
-	wxBitmap tempBmp(frame.GetImage());
 	frame.Clear();
-	dc.DrawBitmap(tempBmp,0,0);
 	Refresh();
 }
 
-
-///////////////
-// Event table
 BEGIN_EVENT_TABLE(SubtitlesPreview,wxWindow)
 	EVT_PAINT(SubtitlesPreview::OnPaint)
 	EVT_SIZE(SubtitlesPreview::OnSize)
 END_EVENT_TABLE()
 
-
+void SubtitlesPreview::OnPaint(wxPaintEvent &) {
-
-/// @brief Paint event 
-/// @param event 
-///
-void SubtitlesPreview::OnPaint(wxPaintEvent &event) {
 	wxPaintDC dc(this);
-	if (!bmp) UpdateBitmap();
+	dc.DrawBitmap(*bmp,0,0);
-	if (bmp) dc.DrawBitmap(*bmp,0,0);
 }
 
+void SubtitlesPreview::OnSize(wxSizeEvent &evt) {
+	if (bmp.get() && evt.GetSize() == bmp->GetSize()) return;
 
+	int w = evt.GetSize().GetWidth();
+	int h = evt.GetSize().GetHeight();
 
-/// @brief Size event 
+	bmp.reset(new wxBitmap(w, h, -1));
-/// @param event 
+	vid.reset(new DummyVideoProvider(0.0, 10, w, h, backColour, true));
-///
+	try {
-void SubtitlesPreview::OnSize(wxSizeEvent &event) {
+		provider.reset(SubtitlesProviderFactoryManager::GetProvider());
-	delete vid;
+	}
-	vid = NULL;
+	catch (...) {
-	UpdateBitmap(event.GetSize().GetWidth(),event.GetSize().GetHeight());
+		wxMessageBox(
+			"Could not get any subtitles provider for the preview box. Make "
+			"sure that you have a provider installed.",
+			"No subtitles provider", wxICON_ERROR | wxOK);
 	}
 
+	subFile->SetScriptInfo("PlayResX", wxString::Format("%i", w));
+	subFile->SetScriptInfo("PlayResY", wxString::Format("%i", h));
 
-
-/// @brief Set colour 
-/// @param col 
-///
-void SubtitlesPreview::SetColour(wxColour col) {
-	backColour = col;
-	delete vid;
-	vid = NULL;
 	UpdateBitmap();
 }
 
-
+void SubtitlesPreview::SetColour(wxColour col) {
+	if (col != backColour) {
+		backColour = col;
+		vid.reset(new DummyVideoProvider(0.0, 10, bmp->GetWidth(), bmp->GetHeight(), backColour, true));
+		UpdateBitmap();
+	}
+}

aegisub/src/subs_preview.h

@@ -34,58 +34,52 @@
 /// @ingroup custom_control
 ///
 
-
-
-
-////////////
-// Includes
 #ifndef AGI_PRE
+#include <memory>
 #include <wx/window.h>
 #include <wx/bitmap.h>
 #endif
 
-
+class AssFile;
-//////////////
-// Prototypes
 class AssStyle;
+class SubtitlesProvider;
 class VideoProvider;
 
-
-
 /// DOCME
 /// @class SubtitlesPreview
-/// @brief DOCME
+/// @brief Preview window to show a short string with a given ass style
-///
-/// DOCME
 class SubtitlesPreview : public wxWindow {
 private:
-
+	/// The subtitle provider used to render the string
-	/// DOCME
+	std::auto_ptr<SubtitlesProvider> provider;
-	wxBitmap *bmp;
+	/// Bitmap to render into
-
+	std::auto_ptr<wxBitmap> bmp;
-	/// DOCME
+	/// The currently display style
 	AssStyle* style;
-
+	/// Video provider to render into
-	/// DOCME
+	std::auto_ptr<VideoProvider> vid;
-	wxString showText;
+	/// Current background color
-
-	/// DOCME
-	VideoProvider *vid;
-
-	/// DOCME
 	wxColour backColour;
+	/// Subtitle file containing the style and displayed line
+	std::auto_ptr<AssFile> subFile;
+	/// Line used to render the specified text
+	AssDialogue* line;
 
-	void UpdateBitmap(int w=-1,int h=-1);
+	/// Regenerate the bitmap
+	void UpdateBitmap();
+	/// Resize event handler
 	void OnSize(wxSizeEvent &event);
-	void OnPaint(wxPaintEvent &event);
+	/// Paint event handler
+	void OnPaint(wxPaintEvent &);
 
 public:
-	void SetStyle(AssStyle *style);
+	/// Set the style to use
+	void SetStyle(AssStyle const& style);
+	/// Set the text to display
 	void SetText(wxString text);
+	/// Set the background color
 	void SetColour(wxColour col);
 
-	/// @brief DOCME
-	///
 	void Update() { UpdateBitmap(); }
 
 	SubtitlesPreview(wxWindow *parent,int id,wxPoint pos,wxSize size,int style,wxColour colour);
@@ -93,5 +87,3 @@ public:
 
 	DECLARE_EVENT_TABLE()
 };
-
-

aegisub/src/video_frame.cpp

@@ -172,7 +172,7 @@ void AegiVideoFrame::SetTo(const unsigned char *const source[], int width, int h
 	
 }
 
-/// @brief This function is only used on screenshots, so it doesn't have to be fast ------ Get wxImage 
+/// @brief Get wxImage 
 /// @return 
 wxImage AegiVideoFrame::GetImage() const {
 	if (format == FORMAT_RGB32 || format == FORMAT_RGB24) {