From 88b845852a63744c2a4447a6a485dce7a10bf1f7 Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Sun, 9 Mar 2008 04:16:52 +0000
Subject: [PATCH] Modifications for 2.1.2
Originally committed to SVN as r1987.
---
aegilib/include/aegilib/section_entry_dialogue.h | 10 +++++-----
aegilib/src/text_file_reader.cpp | 6 +++---
aegisub/version.cpp | 2 +-
build/aegisub_vs2005/aegisub_vs2005.vcproj | 8 ++++++++
installer/aegisub2.iss | 4 ++--
5 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/aegilib/include/aegilib/section_entry_dialogue.h b/aegilib/include/aegilib/section_entry_dialogue.h
index 241568430..6c96f4861 100644
--- a/aegilib/include/aegilib/section_entry_dialogue.h
+++ b/aegilib/include/aegilib/section_entry_dialogue.h
@@ -64,11 +64,11 @@ namespace Aegilib {
virtual bool HasMargins() const { return false; }
// Read accessors
- virtual String GetText() const { ThrowUnsupported(); return L""; }
- virtual Time GetStartTime() const { ThrowUnsupported(); return 0; }
- virtual Time GetEndTime() const { ThrowUnsupported(); return 0; }
- virtual int GetStartFrame() const { ThrowUnsupported(); return 0; }
- virtual int GetEndFrame() const { ThrowUnsupported(); return 0; }
+ virtual String GetText() const { ThrowUnsupported(); }
+ virtual Time GetStartTime() const { ThrowUnsupported(); }
+ virtual Time GetEndTime() const { ThrowUnsupported(); }
+ virtual int GetStartFrame() const { ThrowUnsupported(); }
+ virtual int GetEndFrame() const { ThrowUnsupported(); }
// Write acessors
virtual void SetText(String text) { (void) text; ThrowUnsupported(); }
diff --git a/aegilib/src/text_file_reader.cpp b/aegilib/src/text_file_reader.cpp
index d221c044c..ad5dee544 100644
--- a/aegilib/src/text_file_reader.cpp
+++ b/aegilib/src/text_file_reader.cpp
@@ -148,14 +148,14 @@ Aegilib::String TextFileReader::ReadLineFromFile() {
//wxbuffer.Clear();
//if (buffer.length()) wxbuffer = wxString(buffer.c_str(),*conv);
char temp = 0;
- std::string buffer;
+ std::string buff;
while (temp != '\n' && !file.Eof()) {
file.Read(&temp,1);
if (temp != '\r') {
- buffer += temp;
+ buff += temp;
}
}
- if (buffer.size()) wxbuffer = wxString(buffer.c_str(),*conv);
+ if (buff.size()) wxbuffer = wxString(buff.c_str(),*conv);
}
// Remove line breaks
diff --git a/aegisub/version.cpp b/aegisub/version.cpp
index e355847e4..3aaf3ad39 100644
--- a/aegisub/version.cpp
+++ b/aegisub/version.cpp
@@ -78,7 +78,7 @@ struct VersionInfoStruct {
wxString SCMStr, VersionStr;
// Update this whenever a new version is released
- VersionNumber = _T("v2.1.1");
+ VersionNumber = _T("v2.1.2");
#ifdef _DEBUG
IsDebug = true;
#else
diff --git a/build/aegisub_vs2005/aegisub_vs2005.vcproj b/build/aegisub_vs2005/aegisub_vs2005.vcproj
index cfa4d72bb..0bda8fd0f 100644
--- a/build/aegisub_vs2005/aegisub_vs2005.vcproj
+++ b/build/aegisub_vs2005/aegisub_vs2005.vcproj
@@ -1579,6 +1579,14 @@
RelativePath="..\..\aegisub\keyframe.h"
>
</File>
+ <File
+ RelativePath="..\..\aegisub\lavc_keyframes.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\aegisub\lavc_keyframes.h"
+ >
+ </File>
<File
RelativePath="..\..\aegisub\video_box.cpp"
>
diff --git a/installer/aegisub2.iss b/installer/aegisub2.iss
index 8c653620d..7a12084b0 100644
--- a/installer/aegisub2.iss
+++ b/installer/aegisub2.iss
@@ -289,10 +289,10 @@ begin
temp2 := SetupMessage(msgInstallingLabel);
StringChangeEx(temp2,'[name]','{#MyAppName}',False);
CustomPage := CreateOutputProgressPage(SetupMessage(msgWizardInstalling),temp2);
- CustomPage.SetText('Installing Visual C++ Runtimes... This might take a few minutes.','');
+ CustomPage.SetText('Installing Visual C++ 2005 SP1 Runtimes... This might take a few minutes.','');
CustomPage.Show();
ExtractTemporaryFile('vcredist_x86.exe');
- if not Exec(ExpandConstant('{tmp}\vcredist_x86.exe'), '/qn', '', SW_SHOW, ewWaitUntilTerminated, ExecResult) then
+ if not Exec(ExpandConstant('{tmp}\vcredist_x86.exe'), '/q:a /c:"VCREDI~3.EXE /q:a /c:""msiexec /i vcredist.msi /qn"" "', '', SW_SHOW, ewWaitUntilTerminated, ExecResult) then
begin
MsgBox('Installation of runtime libraries failed. Aegisub will probably not work. The error was: ' + SysErrorMessage(ExecResult), mbInformation, MB_OK);
end;
--
GitLab