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

Update deps

Browse source
This commit is contained in:
Thomas Goyne 2014-03-09 08:45:36 -07:00
parent 9a8e0075cb
commit e0d34bfb01
14 changed files with 21 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
aegisub/build/freetype2/freetype.vcxproj
View file

@ -30,22 +30,18 @@
<!-- Source files --> <!-- Source files -->
<ItemGroup> <ItemGroup>
<InstallHeader Include="$(Freetype2SrcDir)\include\ft2build.h" /> <InstallHeader Include="$(Freetype2SrcDir)\include\*.h" />
<InstallHeader Include="$(Freetype2SrcDir)\include\freetype\*.h"> <InstallHeader Include="$(Freetype2SrcDir)\include\config\*.h">
<Destination>freetype\</Destination> <Destination>config\</Destination>
</InstallHeader> </InstallHeader>
<InstallHeader Include="$(Freetype2SrcDir)\include\freetype\config\*.h"> <InstallHeader Include="$(Freetype2SrcDir)\include\internal\*.h">
<Destination>freetype\config\</Destination> <Destination>internal\</Destination>
</InstallHeader> </InstallHeader>
<InstallHeader Include="$(Freetype2SrcDir)\include\freetype\internal\*.h"> <InstallHeader Include="$(Freetype2SrcDir)\include\internal\services*.h">
<Destination>freetype\internal\</Destination> <Destination>internal\services\</Destination>
</InstallHeader>
<InstallHeader Include="$(Freetype2SrcDir)\include\freetype\internal\services*.h">
<Destination>freetype\internal\services\</Destination>
</InstallHeader> </InstallHeader>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(Freetype2SrcDir)\builds\win32\ftdebug.c" />
<ClCompile Include="$(Freetype2SrcDir)\src\autofit\autofit.c" /> <ClCompile Include="$(Freetype2SrcDir)\src\autofit\autofit.c" />
<ClCompile Include="$(Freetype2SrcDir)\src\base\ftbase.c" /> <ClCompile Include="$(Freetype2SrcDir)\src\base\ftbase.c" />
<ClCompile Include="$(Freetype2SrcDir)\src\base\ftbbox.c" /> <ClCompile Include="$(Freetype2SrcDir)\src\base\ftbbox.c" />

3
aegisub/build/freetype2/freetype.vcxproj.filters
View file

@ -14,9 +14,6 @@
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(Freetype2SrcDir)\builds\win32\ftdebug.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(Freetype2SrcDir)\src\autofit\autofit.c"> <ClCompile Include="$(Freetype2SrcDir)\src\autofit\autofit.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>

2
aegisub/libaegisub/common/parser.cpp
View file

@ -27,7 +27,7 @@
#include <boost/spirit/include/phoenix_fusion.hpp> #include <boost/spirit/include/phoenix_fusion.hpp>
#include <boost/fusion/include/adapt_struct.hpp> #include <boost/fusion/include/adapt_struct.hpp>
#include <boost/spirit/include/lex_lexertl.hpp> #include <boost/spirit/include/lex_lexertl.hpp>
#include <boost/spirit/home/phoenix/statement.hpp> #include <boost/phoenix/statement.hpp>
BOOST_FUSION_ADAPT_STRUCT( BOOST_FUSION_ADAPT_STRUCT(
agi::Color, agi::Color,

2
aegisub/src/audio_timing_dialogue.cpp
View file

@ -751,7 +751,7 @@ void AudioTimingControllerDialogue::RegenerateInactiveLines()
if (mode == 2) if (mode == 2)
{ {
auto next = find_if(++current_line, context->ass->Events.end(), predicate); auto next = std::find_if(++current_line, context->ass->Events.end(), predicate);
if (next != context->ass->Events.end()) if (next != context->ass->Events.end())
AddInactiveLine(sel, &*next); AddInactiveLine(sel, &*next);
} }

4
aegisub/src/command/edit.cpp
View file

@ -602,11 +602,11 @@ static void duplicate_lines(agi::Context *c, int shift) {
auto end = c->ass->Events.end(); auto end = c->ass->Events.end();
while (start != end) { while (start != end) {
// Find the first line in the selection // Find the first line in the selection
start = find_if(start, end, in_selection); start = std::find_if(start, end, in_selection);
if (start == end) break; if (start == end) break;
// And the last line in this contiguous selection // And the last line in this contiguous selection
auto insert_pos = find_if_not(start, end, in_selection); auto insert_pos = std::find_if_not(start, end, in_selection);
auto last = std::prev(insert_pos); auto last = std::prev(insert_pos);
// Duplicate each of the selected lines, inserting them in a block // Duplicate each of the selected lines, inserting them in a block

2
aegisub/src/dialog_timing_processor.cpp
View file

@ -315,7 +315,7 @@ std::vector<AssDialogue*> DialogTimingProcessor::SortDialogues() {
// Check if rows are valid // Check if rows are valid
for (auto diag : sorted) { for (auto diag : sorted) {
if (diag->Start > diag->End) { if (diag->Start > diag->End) {
int line = distance(c->ass->Events.begin(), c->ass->Events.iterator_to(*diag)); int line = std::distance(c->ass->Events.begin(), c->ass->Events.iterator_to(*diag));
wxMessageBox( wxMessageBox(
wxString::Format(_("One of the lines in the file (%i) has negative duration. Aborting."), line), wxString::Format(_("One of the lines in the file (%i) has negative duration. Aborting."), line),
_("Invalid script"), _("Invalid script"),

4
aegisub/src/dialog_translation.cpp
View file

@ -67,7 +67,7 @@ DialogTranslation::DialogTranslation(agi::Context *c)
, active_line_connection(c->selectionController->AddActiveLineListener(&DialogTranslation::OnActiveLineChanged, this)) , active_line_connection(c->selectionController->AddActiveLineListener(&DialogTranslation::OnActiveLineChanged, this))
, active_line(c->selectionController->GetActiveLine()) , active_line(c->selectionController->GetActiveLine())
, line_count(c->ass->Events.size()) , line_count(c->ass->Events.size())
, line_number(distance(c->ass->Events.begin(), c->ass->Events.iterator_to(*active_line)) + 1) , line_number(std::distance(c->ass->Events.begin(), c->ass->Events.iterator_to(*active_line)) + 1)
{ {
SetIcon(GETICON(translation_toolbutton_16)); SetIcon(GETICON(translation_toolbutton_16));
@ -175,7 +175,7 @@ void DialogTranslation::OnActiveLineChanged(AssDialogue *new_line) {
active_line = new_line; active_line = new_line;
blocks = active_line->ParseTags(); blocks = active_line->ParseTags();
cur_block = 0; cur_block = 0;
line_number = distance(c->ass->Events.begin(), c->ass->Events.iterator_to(*new_line)) + 1; line_number = std::distance(c->ass->Events.begin(), c->ass->Events.iterator_to(*new_line)) + 1;
if (bad_block(blocks[cur_block]) && !NextBlock()) { if (bad_block(blocks[cur_block]) && !NextBlock()) {
wxMessageBox(_("No more lines to translate.")); wxMessageBox(_("No more lines to translate."));

2
aegisub/src/threaded_frame_source.cpp
View file

@ -149,7 +149,7 @@ void ThreadedFrameSource::UpdateSubtitles(const AssFile *new_subs, std::set<cons
size_t i = 0; size_t i = 0;
auto it = subs->Events.begin(); auto it = subs->Events.begin();
for (auto& update : changed) { for (auto& update : changed) {
advance(it, update.first - i); std::advance(it, update.first - i);
i = update.first; i = update.first;
subs->Events.insert(it, *update.second); subs->Events.insert(it, *update.second);
delete &*it--; delete &*it--;

2
deps/boost vendored

@ -1 +1 @@
Subproject commit f866ff6fea187a5c9ad80895f078dec577cdc304 Subproject commit 614aac8fef2a0551610f72e5c4a61085c8c06e35

2
deps/ffmpeg vendored

@ -1 +1 @@
Subproject commit f29cdbe1b59a0d997733b507041e15ec68cef00c Subproject commit 8dfd0e62f5d32db66ebbe3e13144ee5720bad585

2
deps/freetype2 vendored

@ -1 +1 @@
Subproject commit 52381c14e3a30a5597060894d9f049420a2f3ac0 Subproject commit ed372b712fa698da24c21746135f2c2c8d738c6e

2
deps/fribidi vendored

@ -1 +1 @@
Subproject commit c1d48ee98b3d254a6b943851665b83cdd76f6150 Subproject commit 77f7f6c0bb16b89eac1e3b3d264f49b2ee02de3e

2
deps/libass vendored

@ -1 +1 @@
Subproject commit 14520fbc70eb63a3ce826c4e985f4233fb657196 Subproject commit 98707694069b6f1808eef5e1d23bc63fb575e067

2
deps/wxWidgets vendored

@ -1 +1 @@
Subproject commit f2bbf083c63bd10e08f35ffd21cfa2864028fae8 Subproject commit 96430b3f3d40c483f49ae419babf6c2e5255ac0a