iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Modifications for 2.1.2 

Originally committed to SVN as r1987.
This commit is contained in:
Rodrigo Braz Monteiro 2008-03-09 04:16:52 +00:00
parent 49d7b55755
commit 88b845852a
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
aegilib/include/aegilib/section_entry_dialogue.h
View File

@ -64,11 +64,11 @@ namespace Aegilib {
virtual bool HasMargins() const { return false; } virtual bool HasMargins() const { return false; }
// Read accessors // Read accessors
virtual String GetText() const { ThrowUnsupported(); return L""; } virtual String GetText() const { ThrowUnsupported(); }
virtual Time GetStartTime() const { ThrowUnsupported(); return 0; } virtual Time GetStartTime() const { ThrowUnsupported(); }
virtual Time GetEndTime() const { ThrowUnsupported(); return 0; } virtual Time GetEndTime() const { ThrowUnsupported(); }
virtual int GetStartFrame() const { ThrowUnsupported(); return 0; } virtual int GetStartFrame() const { ThrowUnsupported(); }
virtual int GetEndFrame() const { ThrowUnsupported(); return 0; } virtual int GetEndFrame() const { ThrowUnsupported(); }
// Write acessors // Write acessors
virtual void SetText(String text) { (void) text; ThrowUnsupported(); } virtual void SetText(String text) { (void) text; ThrowUnsupported(); }

6
aegilib/src/text_file_reader.cpp
View File

@ -148,14 +148,14 @@ Aegilib::String TextFileReader::ReadLineFromFile() {
//wxbuffer.Clear(); //wxbuffer.Clear();
//if (buffer.length()) wxbuffer = wxString(buffer.c_str(),*conv); //if (buffer.length()) wxbuffer = wxString(buffer.c_str(),*conv);
char temp = 0; char temp = 0;
std::string buffer; std::string buff;
while (temp != '\n' && !file.Eof()) { while (temp != '\n' && !file.Eof()) {
file.Read(&temp,1); file.Read(&temp,1);
if (temp != '\r') { 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 // Remove line breaks

2
aegisub/version.cpp
View File

@ -78,7 +78,7 @@ struct VersionInfoStruct {
wxString SCMStr, VersionStr; wxString SCMStr, VersionStr;
// Update this whenever a new version is released // Update this whenever a new version is released
VersionNumber = _T("v2.1.1"); VersionNumber = _T("v2.1.2");
#ifdef _DEBUG #ifdef _DEBUG
IsDebug = true; IsDebug = true;
#else #else

8
build/aegisub_vs2005/aegisub_vs2005.vcproj
View File

@ -1579,6 +1579,14 @@
RelativePath="..\..\aegisub\keyframe.h" RelativePath="..\..\aegisub\keyframe.h"
> >
</File> </File>
<File
RelativePath="..\..\aegisub\lavc_keyframes.cpp"
>
</File>
<File
RelativePath="..\..\aegisub\lavc_keyframes.h"
>
</File>
<File <File
RelativePath="..\..\aegisub\video_box.cpp" RelativePath="..\..\aegisub\video_box.cpp"
> >

4
installer/aegisub2.iss
View File

@ -289,10 +289,10 @@ begin
temp2 := SetupMessage(msgInstallingLabel); temp2 := SetupMessage(msgInstallingLabel);
StringChangeEx(temp2,'[name]','{#MyAppName}',False); StringChangeEx(temp2,'[name]','{#MyAppName}',False);
CustomPage := CreateOutputProgressPage(SetupMessage(msgWizardInstalling),temp2); 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(); CustomPage.Show();
ExtractTemporaryFile('vcredist_x86.exe'); 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 begin
MsgBox('Installation of runtime libraries failed. Aegisub will probably not work. The error was: ' + SysErrorMessage(ExecResult), mbInformation, MB_OK); MsgBox('Installation of runtime libraries failed. Aegisub will probably not work. The error was: ' + SysErrorMessage(ExecResult), mbInformation, MB_OK);
end; end;