diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp index 702f31f21..c5247fdd5 100644 --- a/aegisub/src/command/video.cpp +++ b/aegisub/src/command/video.cpp @@ -219,7 +219,7 @@ struct video_details : public Command { void operator()(agi::Context *c) { c->videoController->Stop(); - DialogVideoDetails(c->parent).ShowModal(); + DialogVideoDetails(c).ShowModal(); } }; diff --git a/aegisub/src/dialog_video_details.cpp b/aegisub/src/dialog_video_details.cpp index e41a6ddd8..4c92abdc3 100644 --- a/aegisub/src/dialog_video_details.cpp +++ b/aegisub/src/dialog_video_details.cpp @@ -43,64 +43,18 @@ #endif #include "dialog_video_details.h" + +#include "include/aegisub/context.h" #include "utils.h" #include "video_context.h" #include "video_provider_manager.h" - -/// @brief Constructor -/// @param parent -/// -DialogVideoDetails::DialogVideoDetails(wxWindow *parent) -: wxDialog(parent , -1, _("Video Details"),wxDefaultPosition,wxDefaultSize) -{ - // Main controls - wxFlexGridSizer *fg = new wxFlexGridSizer(2, 5, 10); - wxBoxSizer *main_sizer = new wxBoxSizer(wxVERTICAL); - wxStaticBoxSizer *video_sizer = new wxStaticBoxSizer(wxVERTICAL,this,_("Video")); - VideoProvider *vprovider = VideoContext::Get()->GetProvider(); - - int width = vprovider->GetWidth(); - int height = vprovider->GetHeight(); - int framecount = vprovider->GetFrameCount(); - double fps = vprovider->GetFPS().FPS(); - - wxTextCtrl *fname_text = new wxTextCtrl(this, -1, VideoContext::Get()->videoName, wxDefaultPosition, wxSize(300,-1), wxTE_READONLY); - wxTextCtrl *fps_text = new wxTextCtrl(this, -1, wxString::Format(_T("%.3f"), fps), wxDefaultPosition, wxDefaultSize, wxTE_READONLY); - wxTextCtrl *resolution_text = new wxTextCtrl(this, -1, wxString::Format(_T("%dx%d (%s)"), width, height, PrettyAR(width, height).c_str()), wxDefaultPosition, wxDefaultSize, wxTE_READONLY); - wxTextCtrl *length_text = new wxTextCtrl(this, -1, wxString::Format(_T("%d frames (%s)"), framecount, PrettyTimeStamp(framecount, fps).c_str()), wxDefaultPosition, wxDefaultSize, wxTE_READONLY); - wxTextCtrl *decoder_text = new wxTextCtrl(this, -1, vprovider->GetDecoderName().c_str(), wxDefaultPosition, wxDefaultSize, wxTE_READONLY); - - fg->Add(new wxStaticText(this, -1, _("File name:")), 0, wxALIGN_CENTRE_VERTICAL | wxEXPAND); - fg->Add(fname_text, 0, wxALIGN_CENTRE_VERTICAL | wxEXPAND); - fg->Add(new wxStaticText(this, -1, _("FPS:")), 0, wxALIGN_CENTRE_VERTICAL | wxEXPAND); - fg->Add(fps_text, 0, wxALIGN_CENTRE_VERTICAL | wxEXPAND); - fg->Add(new wxStaticText(this, -1, _("Resolution:")), 0, wxALIGN_CENTRE_VERTICAL | wxEXPAND); - fg->Add(resolution_text, 0, wxALIGN_CENTRE_VERTICAL | wxEXPAND); - fg->Add(new wxStaticText(this, -1, _("Length:")), 0, wxALIGN_CENTRE_VERTICAL | wxEXPAND); - fg->Add(length_text, 0, wxALIGN_CENTRE_VERTICAL | wxEXPAND); - fg->Add(new wxStaticText(this, -1, _("Decoder:")), 0, wxALIGN_CENTRE_VERTICAL | wxEXPAND); - fg->Add(decoder_text, 0, wxALIGN_CENTRE_VERTICAL | wxEXPAND); - - video_sizer->Add(fg); - - main_sizer->Add(video_sizer, 1, wxALL|wxEXPAND, 5); - main_sizer->Add(CreateSeparatedButtonSizer(wxOK), 0, wxALL|wxEXPAND, 5); - main_sizer->SetSizeHints(this); - SetSizer(main_sizer); - - CenterOnParent(); +static void make_field(wxWindow *parent, wxSizer *sizer, wxString const& name, wxString const& value) { + sizer->Add(new wxStaticText(parent, -1, name), 0, wxALIGN_CENTRE_VERTICAL | wxEXPAND); + sizer->Add(new wxTextCtrl(parent, -1, value, wxDefaultPosition, wxSize(300,-1), wxTE_READONLY), 0, wxALIGN_CENTRE_VERTICAL | wxEXPAND); } - - -/// @brief PrettyAR -/// @param width -/// @param height -/// @return -/// -wxString DialogVideoDetails::PrettyAR(int width, int height) -{ +static wxString pretty_ar(int width, int height) { int limit = (int)ceil(sqrt(double(std::min(width, height)))); for (int i=2;i<=limit;i++) { while (width % i == 0 && height % i == 0) { @@ -108,23 +62,41 @@ wxString DialogVideoDetails::PrettyAR(int width, int height) height /= i; } } - return wxString::Format(_T("%d:%d"), width, height); + return wxString::Format("%d:%d", width, height); } - - -/// @brief PrettyTimeStamp -/// @param frames -/// @param fps -/// -wxString DialogVideoDetails::PrettyTimeStamp(int frames, double fps) -{ +static wxString pretty_time_stamp(int frames, double fps) { int tt = int(frames / fps * 1000); int cs = tt % 1000; tt /= 1000; int s = tt % 60; tt /= 60; int m = tt % 60; tt /= 60; int h = tt; - return wxString::Format(_T("%d:%02d:%02d.%03d"), h, m, s, cs); + return wxString::Format("%d:%02d:%02d.%03d", h, m, s, cs); } +DialogVideoDetails::DialogVideoDetails(agi::Context *c) +: wxDialog(c->parent , -1, _("Video Details")) +{ + int width = c->videoController->GetWidth(); + int height = c->videoController->GetHeight(); + int framecount = c->videoController->GetLength(); + double fps = c->videoController->FPS().FPS(); + wxFlexGridSizer *fg = new wxFlexGridSizer(2, 5, 10); + make_field(this, fg, _("File name:"), c->videoController->videoName); + make_field(this, fg, _("FPS:"), wxString::Format("%.3f", fps)); + make_field(this, fg, _("Resolution:"), wxString::Format("%dx%d (%s)", width, height, pretty_ar(width, height))); + make_field(this, fg, _("Length:"), wxString::Format("%d frames (%s)", framecount, pretty_time_stamp(framecount, fps))); + make_field(this, fg, _("Decoder:"), c->videoController->GetProvider()->GetDecoderName()); + + wxStaticBoxSizer *video_sizer = new wxStaticBoxSizer(wxVERTICAL,this,_("Video")); + video_sizer->Add(fg); + + wxBoxSizer *main_sizer = new wxBoxSizer(wxVERTICAL); + main_sizer->Add(video_sizer, 1, wxALL|wxEXPAND, 5); + main_sizer->Add(CreateSeparatedButtonSizer(wxOK), 0, wxALL|wxEXPAND, 5); + main_sizer->SetSizeHints(this); + SetSizer(main_sizer); + + CenterOnParent(); +} diff --git a/aegisub/src/dialog_video_details.h b/aegisub/src/dialog_video_details.h index 2dfee8e7a..4160397b0 100644 --- a/aegisub/src/dialog_video_details.h +++ b/aegisub/src/dialog_video_details.h @@ -34,36 +34,16 @@ /// @ingroup secondary_ui /// - - -/////////// -// Headers #ifndef AGI_PRE #include #endif +namespace agi { struct Context; } -/// DOCME /// @class DialogVideoDetails -/// @brief DOCME -/// -/// DOCME -class DialogVideoDetails : public wxDialog { -private: - wxString PrettyTimeStamp(int frames, double fps); - wxString PrettyAR(int width, int height); - - - /// DOCME - - /// DOCME - int width, height; - - /// DOCME - - /// DOCME - int framecount, fps; - -public: - DialogVideoDetails(wxWindow *parent); +/// @brief Display information about the video in a dialog +struct DialogVideoDetails : public wxDialog { + /// Constructor + /// @param c Project context + DialogVideoDetails(agi::Context *c); };