mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity
4642 commits 10 branches 31 tags 48 MiB
Commit graph

3202 commits

Author SHA1 Message Date
Thomas Goyne ec2c36c743 Add type flags to commands 
Originally committed to SVN as r5464.
 2011-07-15 04:05:56 +00:00
Thomas Goyne 0af7ae7fca Clean up frame_main a bit 
Delete some pointless comments, move documentation to the header, and
extend it a bit

Sort prototypes in the header

Move event IDs out of the header

Remove a few unused includes

Assorted cosmetic changse

Originally committed to SVN as r5463.
 2011-07-15 04:05:49 +00:00
Thomas Goyne 95cadb5226 Clean up base_grid a bit 
Reduce the visibilty of many members and document some of them

Cut down on recreation of wxPen and wxBrush objects in DrawImage,
probably speeding up painting somewhat

Simplify handling of extendRow

Move event IDs to base_grid.cpp

Remove worthless comments and dead code

Assorted cosmetic changes

Originally committed to SVN as r5462.
 2011-07-15 04:05:43 +00:00
Thomas Goyne fdb6d108f8 Use agi::Context::Validate for the main frame's menus and toolbar 
Originally committed to SVN as r5461.
 2011-07-15 04:05:37 +00:00
Thomas Goyne ef4bfb1535 use agi::Context::Validate for subsgrid context menu item validation 
Originally committed to SVN as r5460.
 2011-07-15 04:05:31 +00:00
Thomas Goyne f098e2fac8 Add an optional Validate method to commands 
Originally committed to SVN as r5459.
 2011-07-15 04:05:22 +00:00
Thomas Goyne d405b061df Eliminate a lot of unnessesary includes of subs_grid.h 
Originally committed to SVN as r5458.
 2011-07-15 04:05:15 +00:00
Thomas Goyne 1d51dd20d2 Return a const reference from GetSelectedSet rather than copying it on every call 
Originally committed to SVN as r5457.
 2011-07-15 04:05:09 +00:00
Thomas Goyne 2eb4c856e8 Simplify and clean up command management code 
Originally committed to SVN as r5456.
 2011-07-15 04:05:01 +00:00
Thomas Goyne e6dc86212b Use the active line rather than first selected line in SubsEditBox 
Originally committed to SVN as r5455.
 2011-07-15 04:04:54 +00:00
Thomas Goyne 4d924b3f27 Move line joining from SubtitlesGrid to the commands 
Originally committed to SVN as r5454.
 2011-07-15 04:04:48 +00:00
Thomas Goyne b25066e3c3 Remove a write-only variable in option.cpp 
Originally committed to SVN as r5453.
 2011-07-15 04:04:42 +00:00
Thomas Goyne 6ec63cdde1 Clean up libaegisub includes 
Remove cajun includes from all public headers and the precompiled header

Add a pile of missing standard library headers used in multiple files
to lagi_pre

Originally committed to SVN as r5452.
 2011-07-15 04:04:34 +00:00
Thomas Goyne 48fbedd25b Remove pointless #pragma onces 
Originally committed to SVN as r5451.
 2011-07-15 04:04:28 +00:00
Thomas Goyne 7e5e82090f Remove incorrect inclusions of config.h in headers 
Originally committed to SVN as r5450.
 2011-07-15 04:04:21 +00:00
Thomas Goyne 256e098aa7 Remove header include order requirements 
Originally committed to SVN as r5449.
 2011-07-15 04:04:13 +00:00
Thomas Goyne 63538d125e Implement lead in/out commands 
Originally committed to SVN as r5448.
 2011-07-15 04:04:07 +00:00
Thomas Goyne 401f026180 Fix crash when detaching video 
Originally committed to SVN as r5447.
 2011-07-15 04:04:01 +00:00
Thomas Goyne 0cb42343e0 Fix the video zoom dropdown 
Originally committed to SVN as r5446.
 2011-07-15 04:03:54 +00:00
Thomas Goyne 9c97544fc5 Temporary hack to make the visual typesetting tool mode hotkeys work 
Originally committed to SVN as r5445.
 2011-07-15 04:03:48 +00:00
Thomas Goyne 3df2885ce5 Temporary hack to make automation macros work 
Originally committed to SVN as r5444.
 2011-07-15 04:03:42 +00:00
Thomas Goyne b5a02e202e Rename libaegisub/windows/util.cpp so that it's actually used 
Originally committed to SVN as r5443.
 2011-07-15 04:03:36 +00:00
Thomas Goyne 67e9384ef4 Remove a bunch of pointless consts from agi::Path and rename the windows implementation so that it's actually used 
Originally committed to SVN as r5442.
 2011-07-15 04:03:28 +00:00
Niels Martin Hansen 9d1cdab638 Merge rewritten ALSA player from 2.1.9. Closes #1106. 
Not tested for compileability, and should probably also have printf's converted to logging statements.

Originally committed to SVN as r5421.
 2011-06-12 00:45:02 +00:00
Niels Martin Hansen a98cfb7685 Merge r5409 from 2.1.9, see #1300. 
Originally committed to SVN as r5410.
 2011-06-06 21:12:00 +00:00
Niels Martin Hansen 23510dcac8 Merge kara-templater remember/recall functions from 2.1.9. Updates #1277. 
Originally committed to SVN as r5378.
 2011-04-26 08:42:05 +00:00
Grigori Goronzy e67b0ea54b wxGTK: do not freeze/thaw the main frame window 
On certain configurations, this is problematic, because windows
sometimes are not thaw()'ed correctly, leading to an interface
that doesn't update. This is a workaround that simply disables all
freeze/thaw on the main frame. I haven't noticed any performance
issues.

Originally committed to SVN as r5373.
 2011-02-23 13:14:48 +00:00
Amar Takhar d6d06b53eb Add Audio/OSS/Device option required by the OSS audio player. 
Originally committed to SVN as r5372.
 2011-02-23 05:14:25 +00:00
Amar Takhar c53492edcd Remove <sys/param.h> and <sys/mount.h> from common/util.cpp this stems from my accident involving placing code meant for unix/util.cpp into unix/common.cpp which was partially fixed in r5366. 
Originally committed to SVN as r5371.
 2011-02-23 03:34:23 +00:00
Amar Takhar 96f24d6c25 Move sys/param.h under ifndef _WIN32, I need to be more vigilant against including Unix headers in Windows builds. 
Originally committed to SVN as r5370.
 2011-02-23 03:29:30 +00:00
Amar Takhar 6ee90d4bb1 Add <vector> 
Originally committed to SVN as r5369.
 2011-02-23 03:24:08 +00:00
Grigori Goronzy 28e1acfeba libaegisub: do not free string returned by getenv() 
getenv() returns a string that is part of internal process data and
should never be modified and/or free()'d.

Originally committed to SVN as r5368.
 2011-02-23 00:55:48 +00:00
Grigori Goronzy 066ec3014a libaegisub: use statvfs instead of statfs 
statvfs is the portable POSIX defined interface and is supported on all
major UNIX platforms.

Originally committed to SVN as r5367.
 2011-02-23 00:54:18 +00:00
Karl Blomster 7db22972a7 sys/mount.h and statfs(2) do not exist on windows 
Originally committed to SVN as r5366.
 2011-02-22 19:03:03 +00:00
Karl Blomster 387fbdfdea fix xml parsing error in libaegisub project 
Originally committed to SVN as r5355.
 2011-02-22 01:26:46 +00:00
Niels Martin Hansen 27839f92ac Fix #1018 properly, make sure the colour values are brought into 0-255 range and rounded. 
Originally committed to SVN as r5354.
 2011-02-22 00:54:20 +00:00
Amar Takhar c0cf0c6a06 Add progress support back to HD Audio Cache with the new ProgressSink from libaegisub. Currently AudioProviderFactory::GetProvider() takes the ProgressSinkFactory however this should probably be moved up to the constructor for AudioProviderFactory. We'll see what the best option is when the others come around it's trivial to change. 
Originally committed to SVN as r5347.
 2011-02-11 03:47:18 +00:00
Amar Takhar 8240d3e6b6 Add util::freespace to check for free space on a path. (with tests) 
Originally committed to SVN as r5346.
 2011-02-10 23:55:59 +00:00
Amar Takhar bbc0f6f859 Document some utility methods. 
Originally committed to SVN as r5345.
 2011-02-10 02:47:41 +00:00
Amar Takhar 3a1487cf6f Finish removing wx from yuv4mpeg... 
Originally committed to SVN as r5344.
 2011-02-10 02:31:42 +00:00
Amar Takhar 2c6abb9a98 Instead of throwing return 0 for invalid values. This happens anyway if the input is invalid so it makes the most sense to return 0 for invalid ranges. 
Originally committed to SVN as r5343.
 2011-02-10 01:36:25 +00:00
Amar Takhar ef7b3c04e3 Add <climits> 
Originally committed to SVN as r5342.
 2011-02-10 01:33:34 +00:00
Amar Takhar 106b331cb0 Mostly convert yuv4mpeg.cpp -- a little bit of parsing is left which I will take care of shortly. 
Originally committed to SVN as r5341.
 2011-02-10 01:33:14 +00:00
Amar Takhar 3522c0b4bd Add a strtoi function. (with unit tests) 
Originally committed to SVN as r5340.
 2011-02-10 00:41:15 +00:00
Amar Takhar 6615d3981f Add <locale>. 
Originally committed to SVN as r5339.
 2011-02-09 23:56:24 +00:00
Amar Takhar 453381e613 Add a small test for str_lower. 
Originally committed to SVN as r5338.
 2011-02-09 23:43:57 +00:00
Amar Takhar c33afffa03 Init agi::log::log. 
Originally committed to SVN as r5337.
 2011-02-09 23:37:18 +00:00
Amar Takhar 34e0eb837d Hand edit the libaegisub vcproj to include common/util.cpp 
Originally committed to SVN as r5336.
 2011-02-09 22:32:51 +00:00
Amar Takhar 75e07c7aa7 Add a short method to make an std::string lowercase. 
Originally committed to SVN as r5335.
 2011-02-09 22:31:44 +00:00
Amar Takhar 6d96457555 Remove "Font/Cache/FontConfig" in lieu of "Cache/FontConfig" and add "Cache/FFmpegSource". 
Originally committed to SVN as r5334.
 2011-02-09 21:57:31 +00:00
Niels Martin Hansen 7638375282 Get rid of a few unused variable warnings. 
Originally committed to SVN as r5333.
 2011-02-09 21:56:10 +00:00
Niels Martin Hansen bc002d749c Make Windows path.cpp actually build. Still not really tested. 
Originally committed to SVN as r5332.
 2011-02-09 21:55:40 +00:00
Niels Martin Hansen acbe4bbb34 Add a bunch of new files to the libaegisub msbuild. 
Originally committed to SVN as r5331.
 2011-02-09 21:55:03 +00:00
Amar Takhar a118487afa Remove cache cleaning code from ffms, I'll eventually write something in libaegisub as we need cache cleaning for other areas too. (debug log, crash logs etc) 
Originally committed to SVN as r5330.
 2011-02-09 21:53:37 +00:00
Amar Takhar ce912335f1 Fix and de wxify video_manager.cpp. 
Originally committed to SVN as r5329.
 2011-02-09 04:41:40 +00:00
Amar Takhar 7d2594b134 s/Video/FFmpegSourceVideoProvider/, originally I was planning something different now we're moving all media-related code, also add missing GetDecoderName() method which was somehow removed by accident in a previous revision. 
Originally committed to SVN as r5328.
 2011-02-09 04:41:15 +00:00
Amar Takhar 83fd95c605 Some fixes to libmedia/video.h 
Originally committed to SVN as r5327.
 2011-02-09 02:30:48 +00:00
Amar Takhar ae7d00a57e Fix and de-wxify audio_manager.cpp 
Originally committed to SVN as r5326.
 2011-02-09 02:28:43 +00:00
Amar Takhar 185721837b s/Audio/FFmpegSourceAudioProvider/, originally I was planning something different now we're moving all media-related code, also replace missing public identifier from the class decleration. 
Originally committed to SVN as r5325.
 2011-02-09 02:28:24 +00:00
Amar Takhar c603c21b86 Print a message to the user and exit(1) if HOME is not set in the users environment. 
Originally committed to SVN as r5324.
 2011-02-08 22:40:55 +00:00
Amar Takhar 436ea23e4c Instantiate agi::Path, I have no idea if this works on windows since my build is still broken and jfs' code is untested. If someone else doesn't get to it I'll see about fixing my build and making it work. (if it's even broken...) 
Originally committed to SVN as r5323.
 2011-02-08 05:05:54 +00:00
Amar Takhar 355ad91105 * Instead of ~ use getenv("HOME") to get the users home directory. 
* Fix Locale() to return P_LOCALE
 * Change data and doc values to P_DATA and P_DOC.

Originally committed to SVN as r5322.
 2011-02-08 04:22:52 +00:00
Amar Takhar 961c1245f7 Remove const in path.cpp (missed in r5320) 
Originally committed to SVN as r5321.
 2011-02-08 03:53:34 +00:00
Amar Takhar bf05289495 * Remove misplaced const on a void method. 
* Forward declare Options to avoid including options.h in the header.

Originally committed to SVN as r5320.
 2011-02-08 03:48:00 +00:00
Niels Martin Hansen 7ae6e6da88 Completely untested implementation of agi::Path for Windows. 
Originally committed to SVN as r5319.
 2011-02-08 00:21:42 +00:00
Amar Takhar 78ed8e3694 Add stub path file for Windows and hand-edit vcproj to include the file. 
Originally committed to SVN as r5318.
 2011-02-07 18:02:26 +00:00
Amar Takhar b3c5bb6e92 Add corrected default_path.json which should have been in r5315. 
Originally committed to SVN as r5317.
 2011-02-07 18:02:04 +00:00
Amar Takhar 0a54e9ca06 Fix inclusion of config.h, when I was writing this I added a relative path directly to acconf.h 
Originally committed to SVN as r5316.
 2011-02-07 17:36:24 +00:00
Amar Takhar a35962923f Finish agi::Path so we can actually use it, our current path system is brutal and I needed this for libmedia. I'll be adding OS X support shortly: someone else will have to figure out what to do with windows it's completely trivial see unix/path.cpp and check libaegisub/path.h for the return values. 
Originally committed to SVN as r5315.
 2011-02-07 16:39:49 +00:00
Amar Takhar 7b06c334aa Add missing headers and change StdioProgressSink() to use std::cout and friends. 
Originally committed to SVN as r5314.
 2011-02-07 00:46:49 +00:00
Amar Takhar e27c3e15b8 Add several progress factories to handle progress bars. The GUI version will come from code within aegisub. 
Originally committed to SVN as r5313.
 2011-02-07 00:12:57 +00:00
Amar Takhar 73913fb0b8 Remove mutex.h from common/log.cpp until the windows build is fixed. 
Originally committed to SVN as r5312.
 2011-02-06 20:45:46 +00:00
Amar Takhar 874950382c s/acconf.h/config.h/ -- I forgot I actually fixed this when adding mutex.h so it was already working with the exception of the namespace change. 
Originally committed to SVN as r5311.
 2011-02-06 20:19:25 +00:00
Amar Takhar 4968fc2b55 Fix ram audio provider: this uses mutex.h (from google) in libaegisub and switches to use agi::io. The progress code has been stubbed out as well as a few path methods. There's no reason to guess at fixing them the only way to do it is after it's actually put into use. 
Originally committed to SVN as r5310.
 2011-02-06 19:52:50 +00:00
Amar Takhar 2edbc8c8c1 Fix mutex.h so we can actually use it. 
Originally committed to SVN as r5309.
 2011-02-06 19:50:59 +00:00
Amar Takhar 3d460ca31f Fix video cache, just needed to stub out one option which will be made a param to the constructor. 
Originally committed to SVN as r5308.
 2011-02-06 19:28:17 +00:00
Amar Takhar 15dab81b91 Fix ram audio provider (this stubs out a few lines used for progress updating. 
Originally committed to SVN as r5307.
 2011-02-06 18:48:42 +00:00
Amar Takhar 2ce135b612 Copy colourspace.(c|h) into libmedia and hack out wx. 
Originally committed to SVN as r5306.
 2011-02-06 03:59:13 +00:00
Amar Takhar 0c15005cc2 Add files to media namespace. 
Originally committed to SVN as r5305.
 2011-02-06 03:32:18 +00:00
Amar Takhar 37bcd0cc12 Fix dummy and pcm audio providers. 
Originally committed to SVN as r5304.
 2011-02-06 03:14:18 +00:00
Amar Takhar 65d216e60d Move dummy.h to dummy_audio.h 
Originally committed to SVN as r5303.
 2011-02-06 03:10:34 +00:00
Amar Takhar f16fb6bb5f Add fix convert and downmix audio providers. 
Originally committed to SVN as r5302.
 2011-02-06 03:09:59 +00:00
Amar Takhar e55ad2ed4d Add files to media namespace 
Originally committed to SVN as r5301.
 2011-02-06 03:08:51 +00:00
Amar Takhar e18ad3768b Switch namespace to media and use VideoProvider 
Originally committed to SVN as r5300.
 2011-02-06 03:02:45 +00:00
Amar Takhar 0ca6266c86 Add missing } to close the namespace. 
Originally committed to SVN as r5299.
 2011-02-06 03:02:13 +00:00
Amar Takhar f8b4b30cf8 Various fixes: 
* svn:ignore
 * rename 'agi' namespace to 'media'
 * Remove some hacks required before bringing in provider code.

Originally committed to SVN as r5298.
 2011-02-06 02:58:49 +00:00
Amar Takhar 97abbf13ce Remove exception.h, this used to be media.h in libaegisub however it's become moot after bringing in the provider headers from aegisub. 
Originally committed to SVN as r5297.
 2011-02-06 02:57:47 +00:00
Amar Takhar f486f8dea8 Commit missed changes to libaegisub/Makefile to remove media code. 
Originally committed to SVN as r5296.
 2011-02-06 00:07:19 +00:00
Amar Takhar ff602f7f2a Copy aegisub/(video|audio)_provider.h to libmedia/(video|audio).h 
Originally committed to SVN as r5295.
 2011-02-06 00:04:55 +00:00
Amar Takhar 7a13a4fb10 Add Makefile, the precompiled header unfortunatly snuck into r5292 -- it's a verbatim copy from libaegisub. 
Originally committed to SVN as r5294.
 2011-02-05 23:49:26 +00:00
Amar Takhar 66b6fdcfc8 Move video_frame.cpp which was left out of r5292. 
Originally committed to SVN as r5293.
 2011-02-05 23:46:09 +00:00
Amar Takhar 511b37ee48 Move converted code out of libaegisub and into libmedia. 
Originally committed to SVN as r5292.
 2011-02-05 23:43:20 +00:00
Amar Takhar 72211ad685 Copy and rename files from src/ into libmedia/. A lot of these headers will have to go into include/*. At the moment there's no point sorting that out until we see the final relation and external api requirements. I'll first unhook all of this code from the UI to figure out what common changes are required then design the final changes for an api that the UI can use sanely. 
Originally committed to SVN as r5290.
 2011-02-05 23:34:12 +00:00
Amar Takhar 7508420000 Commit a WIP for fixing tinderbox distfile building. 
Originally committed to SVN as r5287.
 2011-02-05 22:23:31 +00:00
Amar Takhar 75711f8041 Add FFMPEG LDFLAGS to the reporter as now they're r equired to link libaegisub. It's not worth considering to split it until everything is moved over. 
Originally committed to SVN as r5286.
 2011-02-04 18:41:52 +00:00
Amar Takhar ac2c6508dd Strategically place comments to stub out AskForTrackSelection() and CleanCache(). 
Originally committed to SVN as r5285.
 2011-02-03 18:12:42 +00:00
Amar Takhar 283eff76ac Add LDFLAGS_POST to the shared library target. 
Originally committed to SVN as r5284.
 2011-02-03 18:09:08 +00:00
Amar Takhar d59e0dd075 Add support for removing ffms support and properly link ffms into libaegisub. 
Originally committed to SVN as r5283.
 2011-02-03 18:08:41 +00:00
Amar Takhar e46f83e672 Add -fPIC so ffms can be linked into a shared library. 
Originally committed to SVN as r5282.
 2011-02-03 18:08:11 +00:00
Amar Takhar a733260603 Add missing headers. 
Originally committed to SVN as r5281.
 2011-02-03 17:15:38 +00:00
Amar Takhar ac70f229dc Re-license video_frame.(cpp|h) with permission of copyright holder (Rodrigo Braz Monteiro). 
Originally committed to SVN as r5280.
 2011-02-03 15:52:06 +00:00
Amar Takhar ffff58d698 Compilation fixes now that ffmpegsource_common.cpp has been moved over. Everything compiles correctly now. 
Originally committed to SVN as r5279.
 2011-02-03 15:49:44 +00:00
Amar Takhar b47dd1e220 Add mid() template to util namespace. 
Originally committed to SVN as r5278.
 2011-02-03 15:49:13 +00:00
Amar Takhar bb4aa727d3 Add media/* to the build on Unix. 
Originally committed to SVN as r5277.
 2011-02-03 15:48:46 +00:00
Amar Takhar 36549ff724 Add media.h -- I'm not sure if this will be the perm name, it currently holds exception definitions. 
Originally committed to SVN as r5276.
 2011-02-03 15:48:18 +00:00
Amar Takhar 93ceb59b0f Move ffmpegsource_common.(cpp|h) and change the license to fit the rest of libaegisub with permission of the current license holder (Karl Blomster) 
Originally committed to SVN as r5275.
 2011-02-03 15:47:43 +00:00
Amar Takhar bcafbe2083 Move ffms_* files over to media/ 
Originally committed to SVN as r5274.
 2011-02-03 01:18:43 +00:00
Amar Takhar 629b819e37 Move video_frame.(cpp|h) to libaegisub. The license has not been changed however I have an email sent to amz, I will change it once he responds. 
Originally committed to SVN as r5273.
 2011-02-03 01:18:14 +00:00
Amar Takhar f5308fe65b Move video_provider_ffmpegsource.(cpp|h) and change the license to fit the rest of libaegisub with permission of the current license holder (Karl Blomster) 
Originally committed to SVN as r5272.
 2011-02-03 01:17:15 +00:00
Amar Takhar cddfe3ed20 Wrap code under the agi namespace. 
Originally committed to SVN as r5271.
 2011-02-02 23:23:48 +00:00
Amar Takhar cacc3516c1 This should have gone into r5269: These files were re-licensed with permission of the original author. (Karl Blomster). 
Originally committed to SVN as r5270.
 2011-02-02 23:20:03 +00:00
Amar Takhar 1219b069b1 Copy audio_provider_ffmpegsource.(cpp|h) to ./ffms_audio.(cpp|h) and remove wx usage.. The plan is to move a/v support to libaegisub and write unit tests to make sure we can open/close/seek the "official" formats we want to support. 
Originally committed to SVN as r5269.
 2011-02-02 23:11:17 +00:00
Thomas Goyne b3562eb917 Implement the overscan mask command 
Originally committed to SVN as r5268.
 2011-01-25 04:24:19 +00:00
Thomas Goyne 95c45b3102 Remove pointless #pragma once from video_box.h 
Originally committed to SVN as r5267.
 2011-01-23 07:48:15 +00:00
Thomas Goyne 8d968e4dd5 Move the code for updating the time/frame display boxes from VideoDisplay to VideoBox 
Originally committed to SVN as r5266.
 2011-01-23 07:48:07 +00:00
Thomas Goyne 091c8170f2 Make several of VideoDisplay's members private 
Originally committed to SVN as r5265.
 2011-01-23 07:47:59 +00:00
Thomas Goyne 14420102e4 Update the frame number display and visual typesetting tool when opening a new video 
Originally committed to SVN as r5264.
 2011-01-23 07:47:52 +00:00
Thomas Goyne 10c3a2ca16 Only bind wxEVT_COMMAND_MENU_SELECTED once rather than once per command as large numbers of event handlers make wx explode 
Originally committed to SVN as r5263.
 2011-01-23 06:45:03 +00:00
Thomas Goyne 88be46c657 Add missing #include <algorithm> in ass_export_filter.cpp 
Originally committed to SVN as r5262.
 2011-01-21 06:32:02 +00:00
Thomas Goyne 41f9426634 Make the "From Video" button in the framerate transform configuration actually do something 
Originally committed to SVN as r5261.
 2011-01-21 06:09:28 +00:00
Thomas Goyne b851e50092 Open the correct dialog in tool/export 
Originally committed to SVN as r5260.
 2011-01-21 06:09:20 +00:00
Thomas Goyne ab00aa74ea Actually initialize the context in DialogResample 
Originally committed to SVN as r5259.
 2011-01-21 06:09:13 +00:00
Thomas Goyne af92002d8c Redesign export filters to not be static singletons, removing the need to jump through hoops to avoid static initialization order issues 
Originally committed to SVN as r5258.
 2011-01-21 06:09:04 +00:00
Thomas Goyne 83a461ca63 Port DialogVideoDetails to agi::Context 
Originally committed to SVN as r5257.
 2011-01-21 04:57:44 +00:00
Thomas Goyne 6ad2098749 Make VideoSlider use commands for its key events 
Originally committed to SVN as r5256.
 2011-01-21 04:57:36 +00:00
Thomas Goyne 1f79d89e5b Port DialogJumpTo to agi::Context 
Originally committed to SVN as r5255.
 2011-01-21 04:57:28 +00:00
Thomas Goyne e8b8f876bd Eliminate some uses of VideoContext::Get() 
Originally committed to SVN as r5254.
 2011-01-21 04:57:21 +00:00
Thomas Goyne 9c07798cb5 Delete some dead code in FrameMain 
Originally committed to SVN as r5253.
 2011-01-21 04:57:12 +00:00
Thomas Goyne 71daddeeb2 Convert the video box buttons over to commands 
Originally committed to SVN as r5252.
 2011-01-20 05:58:01 +00:00
Thomas Goyne b286339ce0 Eliminate a few uses of VideoContext::Get() 
Originally committed to SVN as r5251.
 2011-01-20 05:57:53 +00:00
Thomas Goyne 9ec1e1ba79 Explicitly set Collisions to the default (Normal) in the default file so that opening and closing the properties dialog on the default file is a no-op 
Originally committed to SVN as r5250.
 2011-01-20 05:57:46 +00:00
Thomas Goyne 79e11ef5cf Convert the properties dialog over to operating on a context 
Originally committed to SVN as r5249.
 2011-01-20 05:57:38 +00:00
Thomas Goyne 5f0d5757be Make NumValidator less bizzare 
Originally committed to SVN as r5248.
 2011-01-20 05:57:30 +00:00
Thomas Goyne a8ebc1e456 Make AssFile handle autosaving on every commit itself rather than going through FrameMain 
Originally committed to SVN as r5247.
 2011-01-20 05:57:23 +00:00
Thomas Goyne cecaff404b Finish killing FrameMain::SaveSubtitles 
Originally committed to SVN as r5246.
 2011-01-20 05:57:15 +00:00
Thomas Goyne 5270a3bf3a Remove withCharset parameter from FrameMain::SaveSubtitles as it was never used (saving with a charset is done by exporting) 
Originally committed to SVN as r5245.
 2011-01-20 05:57:08 +00:00
Thomas Goyne 1a26edc869 Delete FrameMain::SynchronizeProject as the last use of it was removed in r5207 
Originally committed to SVN as r5244.
 2011-01-20 05:56:59 +00:00
Niels Martin Hansen 0762422b20 Super fancy property pages for configuring the build in VC10. Doesn't want to display the defaults (properly) but that's not so important :) 
Originally committed to SVN as r5243.
 2011-01-19 06:40:23 +00:00
Niels Martin Hansen dd24ffac89 Do some grouping of source files in the VC10 project file. 
Originally committed to SVN as r5242.
 2011-01-19 04:05:30 +00:00
Thomas Goyne ccddf8eab1 Make hotkey::check return whether any hotkeys matched, and skip events which did not match any hotkeys 
Originally committed to SVN as r5241.
 2011-01-19 03:12:46 +00:00
Thomas Goyne ec3d1a9d35 Don't try to reorder things by swapping entries in a set 
Originally committed to SVN as r5240.
 2011-01-18 06:01:29 +00:00
Thomas Goyne 2183442089 Remove the unmodifiered frame left/right hotkeys from default 
Originally committed to SVN as r5239.
 2011-01-18 05:13:34 +00:00
Thomas Goyne 45c33ab675 Add commands for the remaining subtitles grid hotkeys and remove SubtitlesGrid::OnKeyDown entirely 
Originally committed to SVN as r5238.
 2011-01-18 05:13:26 +00:00
Thomas Goyne c3325cb543 Remove AegisubApp::OnKeyDown 
It was an odd hack to ensure that medusa mode didn't mark keydown events
as processed (resulting in EVT_CHAR never triggering), but there should
be a better way to do this when we reintroduce global timing hotkeys.

Originally committed to SVN as r5237.
 2011-01-18 03:42:51 +00:00
Thomas Goyne a4da8c3a61 Update libffms to r411 
Originally committed to SVN as r5236.
 2011-01-18 00:51:38 +00:00
Thomas Goyne 3f9bead41a Use the tr1 version of <tuple> when building with gcc 
Originally committed to SVN as r5235.
 2011-01-18 00:29:40 +00:00
Thomas Goyne c9656381f1 Remove now-pointless #pragma once from audio_box.h 
Originally committed to SVN as r5234.
 2011-01-17 23:54:13 +00:00
Thomas Goyne e0051e09e3 Use commands for most of the buttons in the audio box and add hotkey support 
Originally committed to SVN as r5233.
 2011-01-17 23:54:05 +00:00
Thomas Goyne f79c9e57a0 Add commands for most of the audio box buttons/hotkeys 
Originally committed to SVN as r5232.
 2011-01-17 23:53:59 +00:00
Thomas Goyne 33d8dd2975 Update TooltipManager to work with commands 
Originally committed to SVN as r5231.
 2011-01-17 23:53:52 +00:00
Thomas Goyne 04a4c074b0 Add function to get the string representation of the hotkeys for a command, use it when generating the menu 
Originally committed to SVN as r5230.
 2011-01-17 23:53:46 +00:00
Thomas Goyne cd4b032c25 Make agi::hotkey::Scan const 
Originally committed to SVN as r5229.
 2011-01-17 23:53:38 +00:00
Niels Martin Hansen 7713ea20e0 Produce a default config_windows.h file if one doesn't already exist. 
Allow setting the BUILD_CREDIT define through a property page.

Originally committed to SVN as r5224.
 2011-01-16 23:51:41 +00:00
Niels Martin Hansen 652a8c7806 Lump all the custom targets etc. for Aegisub into a single file, instead of using many. 
Also, no custom project items needed anyway.

Originally committed to SVN as r5223.
 2011-01-16 23:01:26 +00:00
Niels Martin Hansen 1e7718d30b Run TSVN's SubWCRev as part of the build. 
The detection of the tool location is tricky and doesn't seem to work entirely as it should. It Works For Me as it is now, though the property page setting doesn't show the correct default.

Originally committed to SVN as r5222.
 2011-01-16 22:42:30 +00:00
Thomas Goyne f2df585797 Move audio display hotkeys to the Audio category 
Originally committed to SVN as r5221.
 2011-01-16 08:50:00 +00:00
Thomas Goyne a2af06f302 Fix a few errors in the default hotkeys 
Originally committed to SVN as r5220.
 2011-01-16 08:49:53 +00:00
Thomas Goyne 8c8b149236 Fix a few warnings in the reporter 
Originally committed to SVN as r5219.
 2011-01-16 07:18:06 +00:00
Thomas Goyne be71a66600 Add command and AudioController support for saving audio clips 
Originally committed to SVN as r5218.
 2011-01-16 07:18:00 +00:00
Thomas Goyne 403d465475 Fix hotkeys with non-alphanumeric keys other than back, return, escape, space and delete 
Originally committed to SVN as r5217.
 2011-01-16 07:17:53 +00:00
Thomas Goyne a1bd974969 Partially convert the subtitles grid's context menu over to using commands 
Originally committed to SVN as r5216.
 2011-01-16 07:17:46 +00:00
Thomas Goyne df1dce3593 Kill SubtitlesGrid::ass and SubtitlesGrid::EditBox and convert everything that used them over to agi::Context 
Originally committed to SVN as r5215.
 2011-01-16 07:17:36 +00:00
Thomas Goyne 778338fa2b Remove FrameMain::menuCreated 
Originally committed to SVN as r5214.
 2011-01-16 07:17:29 +00:00
Thomas Goyne 6c0db27fac Remove some of FrameMain's friends 
Originally committed to SVN as r5213.
 2011-01-16 07:17:24 +00:00
Thomas Goyne 362e4c776b Make a large chunk of FrameMain's members private 
Originally committed to SVN as r5212.
 2011-01-16 07:17:17 +00:00
Thomas Goyne d84b768171 Remove the 'audio' and 'grid' public members from VideoContext and migrate everything that used them over to Context 
Originally committed to SVN as r5211.
 2011-01-16 07:17:08 +00:00
Thomas Goyne 169d3cd31c Add the selection controller to the context 
Originally committed to SVN as r5210.
 2011-01-16 07:17:02 +00:00
Thomas Goyne 8544565c0e Rearrange FrameMain initialization order to seperate context initialization and control creation a bit, and eliminate local pointers to non-view parts of the context 
Originally committed to SVN as r5209.
 2011-01-16 07:16:54 +00:00
Thomas Goyne 9f25b51a54 Rearrange context.h 
Originally committed to SVN as r5208.
 2011-01-16 07:16:48 +00:00
Thomas Goyne 7210ea17d8 Add pre-save signal to AssFile and move most of the logic in FrameMain::SaveSubtitles to slots for this signal 
Originally committed to SVN as r5207.
 2011-01-16 07:16:40 +00:00
Thomas Goyne 59300cbc27 Add a subtitle open signal and move most of the logic in FrameMain::LoadSubtitles to slots for this signal. 
Originally committed to SVN as r5206.
 2011-01-16 07:16:33 +00:00
Thomas Goyne 314a07c9ab Move post-video-load logic from FrameMain::LoadVideo to FrameMain::OnVideoOpen, and open videos via VideoContext directly 
Originally committed to SVN as r5205.
 2011-01-16 07:16:27 +00:00
Thomas Goyne 1664faf159 Make SubtitlesGrid listen for changes to "Subtitle/Grid/Hide Overrides" rather than refreshing it from the command 
Originally committed to SVN as r5204.
 2011-01-16 07:16:21 +00:00
Thomas Goyne bee57ccad3 Make DialogSpellChecker operate on a context rather than going through FrameMain 
Originally committed to SVN as r5203.
 2011-01-16 07:16:13 +00:00
Thomas Goyne 1aeded1a29 Make scoped_ptr's constructor explicit 
Originally committed to SVN as r5202.
 2011-01-16 07:16:07 +00:00
Thomas Goyne 71937757a2 Remove #pragma once from context.h and fix resulting compilation errors 
Originally committed to SVN as r5201.
 2011-01-16 07:16:00 +00:00
Thomas Goyne 64ebce6c0f Move NextFrame and PrevFrame from VideoSlider to VideoContext 
Originally committed to SVN as r5200.
 2011-01-16 07:15:53 +00:00
Thomas Goyne 08ec92046f Implement MRU commands 
Originally committed to SVN as r5199.
 2011-01-16 07:15:46 +00:00
Thomas Goyne ecea389e62 Add macro for defining command groups (i.e. menus) as they're almost entirely boilerplate 
Originally committed to SVN as r5198.
 2011-01-16 07:15:40 +00:00
Thomas Goyne 583aed4533 Convert commands to structs to eliminate a line of boilerplate per command 
Originally committed to SVN as r5197.
 2011-01-16 07:15:32 +00:00
Thomas Goyne 9779eacbf1 Implement almost all stubbed-out commands other than the MRU ones 
Originally committed to SVN as r5196.
 2011-01-16 07:15:24 +00:00
Thomas Goyne 7afbce439d AppName has to be set before ?user can be used 
Originally committed to SVN as r5195.
 2011-01-16 07:15:18 +00:00
Thomas Goyne f604e0bacd Add spacers to the main toolbar 
Originally committed to SVN as r5194.
 2011-01-16 07:15:11 +00:00
Thomas Goyne 77cb5b75b8 Disable the video details menu item when no video is loaded 
Originally committed to SVN as r5193.
 2011-01-16 07:15:05 +00:00
Thomas Goyne 685d4841dc Wrap documentation in audio_timing.h at 80 columns 
Originally committed to SVN as r5192.
 2011-01-16 07:14:59 +00:00
Thomas Goyne daa8c58cd8 Don't announce marker movements that update the styled ranges as well; it's redundant and the marker move signal is more useful as only non-interactive markers. 
Originally committed to SVN as r5191.
 2011-01-16 07:14:53 +00:00
Thomas Goyne cc5952035e Don't declare methods as virtual in a class not intended to be inherited from 
Originally committed to SVN as r5190.
 2011-01-16 07:14:47 +00:00
Thomas Goyne 84ffb4414a Update vs2008 respack project 
Originally committed to SVN as r5189.
 2011-01-16 07:14:24 +00:00
Niels Martin Hansen 4c5d8f54ea Forgot svn:keywords... 
Originally committed to SVN as r5188.
 2011-01-14 07:52:41 +00:00
Niels Martin Hansen 238f2dedb6 Custom property page for the respack tool, how cool! 
Also include the standard targets later to make the projects stop spewing build status files into wrong dirs.

Originally committed to SVN as r5187.
 2011-01-14 07:40:06 +00:00
Niels Martin Hansen a7dd3611a2 Here's an MSBuild project file for Aegisub itself! 
Originally committed to SVN as r5186.
 2011-01-14 03:49:28 +00:00
Niels Martin Hansen cda28d706b More clean-up of the MSBuild projects. (The IDE hates me for this.) 
Originally committed to SVN as r5185.
 2011-01-14 03:47:57 +00:00
Niels Martin Hansen 6490faa5c5 Prevent CSRI helper library from causing linking apps (like aegisub.exe) to export symbols. 
Originally committed to SVN as r5184.
 2011-01-14 02:05:01 +00:00
Niels Martin Hansen 8b58a63bd5 CSRI helper library MSBuild project. 
Originally committed to SVN as r5183.
 2011-01-14 01:30:17 +00:00
Niels Martin Hansen 1e6ace134a Respack produced invalid resources on Windows since it was opening files in text mode, causing newline conversions to happen. 
Having it open files in binary mode instead fixes the problem.

Originally committed to SVN as r5182.
 2011-01-14 01:29:47 +00:00
Niels Martin Hansen 59b8686fdc MSBuild project for chardet. 
Originally committed to SVN as r5181.
 2011-01-14 01:08:47 +00:00
Niels Martin Hansen 73905fb1b5 Add some DirectX detection. 
Originally committed to SVN as r5180.
 2011-01-11 22:04:47 +00:00
Niels Martin Hansen 87ac25bfa7 Add some missing files to the libaegisub project. Make Lua compile as C++ to get C++ name mangling, as Aegisub expects that. 
Originally committed to SVN as r5179.
 2011-01-11 22:04:21 +00:00
Amar Takhar 585b108671 Takes exactly 3 arguments it's not a minimum. 
Originally committed to SVN as r5178.
 2011-01-11 21:50:27 +00:00
Amar Takhar 357adc07dc Add some comments. 
Originally committed to SVN as r5177.
 2011-01-11 21:47:59 +00:00
Niels Martin Hansen 5d6730919d Fix ResPack target not actually building the intended resource files. 
Originally committed to SVN as r5176.
 2011-01-11 21:36:13 +00:00
Niels Martin Hansen f1121898b9 Update ResPack project, write ResPack target for MSBuild and add libresrc project that uses the ResPack target. 
The ResPack target is not ideal, it will regenerate the source files even when they are up to date, if only the object files are outdated. This means that in batch builds, the source files will get regenerated for every platform/config built.

Originally committed to SVN as r5175.
 2011-01-11 20:25:47 +00:00
Niels Martin Hansen 3974dfd1f2 Reorganise the property sheet includes to use a master include, and use properties to control inclusion of wxWidgets and Freetype, and any further deps. 
Originally committed to SVN as r5174.
 2011-01-11 18:15:31 +00:00
Amar Takhar 75b732bf60 Use lowercase filenames for OS X includes. HFS is case-insensitive and since I'm cross-compiling the OS X version from Linux it fails when you try to include files using uppercase names when they're actually lowercase. 
Originally committed to SVN as r5173.
 2011-01-11 17:52:17 +00:00
Niels Martin Hansen a7954fc3e0 MSBuild project for libaegisub. 
Originally committed to SVN as r5172.
 2011-01-11 17:50:03 +00:00
Amar Takhar f576bf912a Add missing headers. 
Originally committed to SVN as r5171.
 2011-01-11 17:22:44 +00:00
Amar Takhar a3534f2cae Fix identifers, _misc is no longer used. 
Originally committed to SVN as r5169.
 2011-01-11 17:00:11 +00:00
Amar Takhar 3ce2b1d802 Fix build to use new method. 
Originally committed to SVN as r5168.
 2011-01-11 16:59:03 +00:00
Amar Takhar 1a9f9abbed Add respack manifests. 
Originally committed to SVN as r5167.
 2011-01-11 16:58:47 +00:00
Amar Takhar 29f02c515b Move buttons from 16/* and 24/* to button/*_(16|24).png. This is a closer representation of what they're like in-source and in the future we'll only have 1 version of each icon 
Originally committed to SVN as r5166.
 2011-01-11 16:57:44 +00:00
Amar Takhar 9d34dfb01c Rewrite respack in pure C++, this is required to make cross-compiling sane. 
Originally committed to SVN as r5165.
 2011-01-11 16:55:15 +00:00
Amar Takhar a02fee90c3 Add a quick script used for distfile building. I don't see any reason to support a pure makefile solution and make it unnecessarily complex. In the future if anyone feels they may want to use this build system I'll change it otherwise we'll use this for now. 
Originally committed to SVN as r5164.
 2011-01-10 21:33:58 +00:00
Amar Takhar 7a8829efdc Remove Makefile.inc from EXTRA_DIST 
Originally committed to SVN as r5163.
 2011-01-10 21:32:54 +00:00
Amar Takhar 03ca62df22 Include dependency files into the Makefiles. This gives us dep tracking for headers. 
Originally committed to SVN as r5162.
 2011-01-10 21:27:39 +00:00
Niels Martin Hansen 0d6edabbdc Prettify the property files a bit and add some real sample files for the userconfig dir. 
Originally committed to SVN as r5161.
 2011-01-10 17:46:15 +00:00
Niels Martin Hansen 5f7fbf48c6 Use project relative paths for source files, to work around this (possible) MSBuild bug: 
https://connect.microsoft.com/VisualStudio/feedback/details/635294/using-absolute-path-in-clcompile-item-prevents-property-pages-from-showing

Originally committed to SVN as r5160.
 2011-01-10 01:27:12 +00:00
Niels Martin Hansen 231220cc63 Oops, left in an Import that shouldn't be there anyway. 
Originally committed to SVN as r5159.
 2011-01-09 23:06:01 +00:00
Karl Blomster a90d855950 update ffms2 to r409 
Originally committed to SVN as r5158.
 2011-01-09 21:47:46 +00:00
Niels Martin Hansen a08eb28846 MSBuild projects for the contrib libraries, except CSRI. 
There is an odd bug/glitch where it is impossible to view property pages for single source files through the VS 2010 IDE, but compilation works as intended.

Originally committed to SVN as r5157.
 2011-01-09 08:01:57 +00:00
Niels Martin Hansen 95c2649721 Add a bunch more property files for MSBuild projects 
Originally committed to SVN as r5156.
 2011-01-09 07:08:36 +00:00
Amar Takhar c2a81a5dd7 Add a cast to make x64 build on windows happy. 
Originally committed to SVN as r5155.
 2011-01-09 02:49:49 +00:00
Amar Takhar e1a59d307e * Fix iconv LDFLAGS for *bsd* 
* Minor style fix for $GL_LIBS test.
 * Fail if iconv isn't found.
 * Fix variable name for the ! subtitle-found case which was over-writing the audio variable.

Originally committed to SVN as r5154.
 2011-01-09 01:37:34 +00:00
Amar Takhar 73bd4f2398 * Remove awk check -- we haven't need it in over a year. 
* Remove check for iconv.m4, I switched to custom code over a year ago.

Originally committed to SVN as r5153.
 2011-01-09 01:36:18 +00:00
Amar Takhar 23d96d071c Add missing property sheets to x64 build config. 
Originally committed to SVN as r5152.
 2011-01-09 00:47:06 +00:00
Niels Martin Hansen a13e0ddedf Clear out some warnings emitted by Visual C++ 2010. 
On 32 bit VC 2010, std::streamsize is 64 bit while size_t is 32 bit.

Originally committed to SVN as r5151.
 2011-01-08 21:58:48 +00:00
Niels Martin Hansen abf9ee645b std::basic_streambuf::_Sgetn_s was removed was Visual C++ 2010 for some reason. 
Originally committed to SVN as r5150.
 2011-01-08 21:54:31 +00:00
Karl Blomster 71928bc25b update ffms2 to r407 
Originally committed to SVN as r5149.
 2011-01-08 20:32:18 +00:00
Amar Takhar 8f401a838a Add utilities to a util:: namespace for clarity. 
Originally committed to SVN as r5148.
 2011-01-08 19:16:11 +00:00
Amar Takhar 68aa077add Actually add util.(c|h) which should have been in r5146. 
Originally committed to SVN as r5147.
 2011-01-08 19:14:48 +00:00
Amar Takhar 93f8b84688 * Instantiate log class. 
* Create new util file and add a config_path() function to get Aegisubs' configuration directory.
 * Header cleanu

Originally committed to SVN as r5146.
 2011-01-08 19:14:02 +00:00
Amar Takhar 3f110101aa Ensure the proper cflags are set for common/charset_conv.cpp in libaegisub. Also fix iconv include path on *bsd. 
Originally committed to SVN as r5145.
 2011-01-08 17:46:46 +00:00
Amar Takhar 69af40edc6 Fix compilation of linux support in the reporter. 
Originally committed to SVN as r5144.
 2011-01-08 15:38:30 +00:00
Amar Takhar 55803684c3 Use -Wl for linker flags. 
Originally committed to SVN as r5143.
 2011-01-08 15:38:11 +00:00
Amar Takhar 4eeacb5ab9 Silence warning. 
Originally committed to SVN as r5142.
 2011-01-08 15:25:04 +00:00
Amar Takhar c67fe6db5d Re-add platform-specific headers and fix prototypes. 
Originally committed to SVN as r5141.
 2011-01-08 15:24:35 +00:00
Amar Takhar 9d5a2b41b5 Add missing headers and sort. 
Originally committed to SVN as r5140.
 2011-01-08 15:18:58 +00:00
Amar Takhar ef76d4b91b Remove debug printf. 
Originally committed to SVN as r5139.
 2011-01-08 15:17:11 +00:00
Amar Takhar 7155e550ad Update for change of paths. 
Originally committed to SVN as r5138.
 2011-01-08 14:22:23 +00:00
Amar Takhar 1530115458 Add libaegisub to solution. 
Originally committed to SVN as r5137.
 2011-01-08 14:22:12 +00:00
Amar Takhar 319ac2d4bb Catch all exceptions when deciding whether to load the default config. 
Originally committed to SVN as r5136.
 2011-01-08 12:13:24 +00:00
Amar Takhar 0d7b2c6e76 Add missing headers when not using precompiled header support. Some minor formatting in libaegisub/common/hotkey.cpp. 
Originally committed to SVN as r5135.
 2011-01-08 12:10:40 +00:00
Amar Takhar c95d92c2ca Add a temp conditional to avoid exceptions when a command doesn't exist since the hotkeys aren't fully converted. 
Originally committed to SVN as r5134.
 2011-01-06 15:33:55 +00:00
Thomas Goyne b56b641122 MSVC hurfs a blurf when two files in the same project have the same name 
Originally committed to SVN as r5133.
 2011-01-05 18:40:46 +00:00
Thomas Goyne e450cb3e7e Fix include paths 
Originally committed to SVN as r5132.
 2011-01-05 18:40:37 +00:00
Thomas Goyne c6b65d8b82 Remove deleted files from the projects and add the new files 
Originally committed to SVN as r5131.
 2011-01-05 18:40:30 +00:00
Thomas Goyne 813aab2473 Add default_hotkey.json, default_menu.json, default_path.json, and default_toolbar.json to respack's post-build event. 
Originally committed to SVN as r5130.
 2011-01-05 18:40:24 +00:00
Amar Takhar 1ac31c65bf Remove medusa commands, they don't technically exist anymore as we call it "global timing mode" now. 
Originally committed to SVN as r5129.
 2011-01-05 14:19:11 +00:00
Amar Takhar 2804e0cb52 Actually trigger a hotkey if it exists. 
Originally committed to SVN as r5128.
 2011-01-05 14:07:23 +00:00
Amar Takhar 9915fb1c3b Add a depedency for libresrc on the 'command' subdir to ensure it's built first. 
Originally committed to SVN as r5127.
 2011-01-05 13:36:13 +00:00
Amar Takhar 167f09a610 Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258. 
Originally committed to SVN as r5126.
 2011-01-05 13:00:46 +00:00