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

Updated projects to include /MP, and some changes to Athenasub. 

Originally committed to SVN as r2292.
This commit is contained in:
Rodrigo Braz Monteiro 2008-07-27 21:24:38 +00:00
parent e019c333d9
commit 29ed35de5c
7 changed files with 149 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aegilib/aegilib_2008.vcproj
View File

@ -40,6 +40,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="include/aegilib" AdditionalIncludeDirectories="include/aegilib"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB" PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
@ -109,6 +110,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
@ -183,6 +185,10 @@
RelativePath=".\include\aegilib\fastbuffer.h" RelativePath=".\include\aegilib\fastbuffer.h"
> >
</File> </File>
<File
RelativePath=".\include\aegilib\range.h"
>
</File>
<File <File
RelativePath=".\include\aegilib\selection.h" RelativePath=".\include\aegilib\selection.h"
> >

158
aegilib/include/aegilib/controller.h
View File

@ -1,79 +1,79 @@
// Copyright (c) 2008, Rodrigo Braz Monteiro // Copyright (c) 2008, Rodrigo Braz Monteiro
// All rights reserved. // All rights reserved.
// //
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met: // modification, are permitted provided that the following conditions are met:
// //
// * Redistributions of source code must retain the above copyright notice, // * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer. // this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice, // * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation // this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution. // and/or other materials provided with the distribution.
// * Neither the name of the Aegisub Group nor the names of its contributors // * Neither the name of the Aegisub Group nor the names of its contributors
// may be used to endorse or promote products derived from this software // may be used to endorse or promote products derived from this software
// without specific prior written permission. // without specific prior written permission.
// //
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE // AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE // IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE // ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR // LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF // CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS // SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN // INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE. // POSSIBILITY OF SUCH DAMAGE.
// //
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// //
// AEGISUB/ATHENASUB // AEGISUB/ATHENASUB
// //
// Website: http://www.aegisub.net // Website: http://www.aegisub.net
// Contact: mailto:amz@aegisub.net // Contact: mailto:amz@aegisub.net
// //
#pragma once #pragma once
#include "athenastring.h" #include "athenastring.h"
#include "tr1.h" #include "tr1.h"
#include "format.h" #include "format.h"
#include "api.h" #include "api.h"
namespace Athenasub { namespace Athenasub {
// Prototypes // Prototypes
class Model; class Model;
class ActionList; class ActionList;
typedef shared_ptr<ActionList> ActionListPtr; typedef shared_ptr<ActionList> ActionListPtr;
// Controller class // Controller class
class Controller { class Controller {
private: private:
Model &model; Model &model;
public: public:
Controller (Model &model); Controller (Model &model);
ActionListPtr CreateActionList(const String title,const String owner=L"",bool undoAble=true); ActionListPtr CreateActionList(const String title,const String owner=L"",bool undoAble=true);
void LoadFile(const String filename,const String encoding=L""); void LoadFile(const String filename,const String encoding=L"");
void SaveFile(const String filename,const String encoding=L"UTF-8"); void SaveFile(const String filename,const String encoding=L"UTF-8");
bool CanUndo(const String owner=L"") const; bool CanUndo(const String owner=L"") const;
bool CanRedo(const String owner=L"") const; bool CanRedo(const String owner=L"") const;
void Undo(const String owner=L""); void Undo(const String owner=L"");
void Redo(const String owner=L""); void Redo(const String owner=L"");
DialoguePtr CreateDialogue() const; DialoguePtr CreateDialogue() const;
StylePtr CreateStyle() const; StylePtr CreateStyle() const;
DialogueConstPtr GetDialogue(size_t n) const; DialogueConstPtr GetDialogue(size_t n) const;
DialogueConstPtr GetStyle(size_t n) const; DialogueConstPtr GetStyle(size_t n) const;
StyleConstPtr GetStyle(String name) const; StyleConstPtr GetStyle(String name) const;
EntryConstPtr GetEntry(size_t n,String section) const; EntryConstPtr GetEntry(size_t n,String section) const;
const FormatPtr GetFormat() const; const FormatPtr GetFormat() const;
}; };
typedef shared_ptr<Controller> ControllerPtr; typedef shared_ptr<Controller> ControllerPtr;
} }

58
aegilib/include/aegilib/range.h Normal file
View File

@ -0,0 +1,58 @@
// Copyright (c) 2008, Rodrigo Braz Monteiro
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of the Aegisub Group nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// -----------------------------------------------------------------------------
//
// AEGISUB/ATHENASUB
//
// Website: http://www.aegisub.net
// Contact: mailto:amz@aegisub.net
//
#pragma once
#include "exception.h"
namespace Athenasub {
// Range class
class Range {
private:
size_t start,end;
public:
Range() : start(0), end(0) {}
Range(size_t _start,size_t _end) : start(_start), end(_end) {}
size_t GetLine(size_t n) const {
if (start+n < end) return start+n;
else THROW_ATHENA_EXCEPTION(Exception::Out_Of_Range);
}
size_t GetSize() const { return end-start; }
size_t GetStart() const { return start; }
size_t GetEnd() const { return end; }
};
}

17
aegilib/include/aegilib/selection.h
View File

@ -35,25 +35,10 @@
#pragma once #pragma once
#include <vector> #include <vector>
#include "api.h" #include "range.h"
namespace Athenasub { namespace Athenasub {
// Range class
class Range {
private:
size_t start,end;
public:
Range() : start(0), end(0) {}
Range(size_t _start,size_t _end) : start(_start), end(_end) {}
size_t GetLine(size_t n) const;
size_t GetSize() const { return end-start; }
size_t GetStart() const { return start; }
size_t GetEnd() const { return end; }
};
// Selection class // Selection class
class Selection { class Selection {
private: private:

9
aegilib/src/selection.cpp
View File

@ -152,12 +152,3 @@ void Selection::RemoveSelection (const Selection &param)
{ {
(void) param; (void) param;
} }
/////////////////////
// Get line in range
size_t Range::GetLine(size_t n) const
{
if (start+n < end) return start+n;
else THROW_ATHENA_EXCEPTION(Exception::Out_Of_Range);
}

3
aegilib/test/test_2008.vcproj
View File

@ -139,11 +139,12 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkIncremental="1" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
LinkTimeCodeGeneration="0"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"
DataExecutionPrevention="0" DataExecutionPrevention="0"
TargetMachine="1" TargetMachine="1"

3
build/aegisub_vs2008/aegisub_vs2008.vcproj
View File

@ -44,6 +44,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../aegisub/win32;../../hunspell/src" AdditionalIncludeDirectories="../../aegisub/win32;../../hunspell/src"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
@ -216,6 +217,8 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP"
WholeProgramOptimization="false"
AdditionalIncludeDirectories="../../aegisub/win32;../../hunspell/src" AdditionalIncludeDirectories="../../aegisub/win32;../../hunspell/src"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2" RuntimeLibrary="2"