mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Make VideoContext::Reset private and use SetVideo to close the video so that the change gets announced properly

Browse source 
Originally committed to SVN as r5903.
This commit is contained in:
Thomas Goyne 2011-11-23 18:32:37 +00:00
parent eb2a6e14fa
commit dc8dbbb535
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
aegisub/src/video_context.h
View file

@ -153,6 +153,9 @@ class VideoContext : public wxEvtHandler {
void OnSubtitlesCommit(); void OnSubtitlesCommit();
void OnSubtitlesSave(); void OnSubtitlesSave();
/// @brief Close the video, keyframes and timecodes
void Reset();
public: public:
/// File name of currently open video, if any /// File name of currently open video, if any
wxString videoName; wxString videoName;
@ -219,8 +222,6 @@ public:
/// @brief Open a new video /// @brief Open a new video
/// @param filename Video to open, or empty to close the current video /// @param filename Video to open, or empty to close the current video
void SetVideo(const wxString &filename); void SetVideo(const wxString &filename);
/// @brief Close the video, keyframes and timecodes
void Reset();
/// @brief Close and reopen the current video /// @brief Close and reopen the current video
void Reload(); void Reload();

4
aegisub/src/video_display.cpp
View file

@ -164,7 +164,7 @@ void VideoDisplay::UploadFrameData(FrameReadyEvent &evt) {
"programs and updating your video card drivers may fix this.\n" "programs and updating your video card drivers may fix this.\n"
"Error message reported: %s", "Error message reported: %s",
err.GetMessage()); err.GetMessage());
con->videoController->Reset(); con->videoController->SetVideo("");
} }
catch (const VideoOutRenderException& err) { catch (const VideoOutRenderException& err) {
wxLogError( wxLogError(
@ -224,7 +224,7 @@ catch (const agi::Exception &err) {
"An error occurred trying to render the video frame on the screen.\n" "An error occurred trying to render the video frame on the screen.\n"
"Error message reported: %s", "Error message reported: %s",
err.GetChainedMessage()); err.GetChainedMessage());
con->videoController->Reset(); con->videoController->SetVideo("");
} }
void VideoDisplay::DrawOverscanMask(float horizontal_percent, float vertical_percent) const { void VideoDisplay::DrawOverscanMask(float horizontal_percent, float vertical_percent) const {