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
b47dd1e220
Add mid() template to util namespace.
...
Originally committed to SVN as r5278.
2011-02-03 15:49:13 +00:00
bb4aa727d3
Add media/* to the build on Unix.
...
Originally committed to SVN as r5277.
2011-02-03 15:48:46 +00:00
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
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
bcafbe2083
Move ffms_* files over to media/
...
Originally committed to SVN as r5274.
2011-02-03 01:18:43 +00:00
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
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
cddfe3ed20
Wrap code under the agi namespace.
...
Originally committed to SVN as r5271.
2011-02-02 23:23:48 +00:00
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
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
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
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
cd4b032c25
Make agi::hotkey::Scan const
...
Originally committed to SVN as r5229.
2011-01-17 23:53:38 +00:00
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
1aeded1a29
Make scoped_ptr's constructor explicit
...
Originally committed to SVN as r5202.
2011-01-16 07:16:07 +00:00
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
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
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
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
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
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
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
e450cb3e7e
Fix include paths
...
Originally committed to SVN as r5132.
2011-01-05 18:40:37 +00:00
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
cdc73b17d2
Add support for bitmask options to Options. First one is to avoid flushing the config to disk which we don't want to happen when the reporter uses Options to read config values.
...
Originally committed to SVN as r5123.
2011-01-04 04:24:40 +00:00
5920c3124b
Make agi::Signal uncopyable
...
Originally committed to SVN as r5076.
2010-12-31 21:02:49 +00:00
a566955047
Rename signals.h to signal.h
...
Originally committed to SVN as r5075.
2010-12-31 21:02:42 +00:00
edff7d6a2d
Rewrite keyframe loading and saving code and move it to libaegisub
...
Originally committed to SVN as r5073.
2010-12-31 21:02:17 +00:00
063cd0480d
OS X also needs typename to be defined within the template, that makes Windows,BSD and OS X, it's better to exclude platforms when we hit them.
...
Originally committed to SVN as r4920.
2010-12-08 18:58:10 +00:00
944eaa535e
Remove universalchardet headers from the precompiled header. For some reason this was causing issues with compliation on FreeBSD, rather than investigate why I removed it since it's used by exactly 1 file (charset_ucd.cpp). If it's going to cause one problem now it may cause another later that we may not notice.
...
Originally committed to SVN as r4919.
2010-12-08 14:32:30 +00:00
5d73bcc598
Remove common/option_value.cpp it was converted to use signals in r4899.
...
Originally committed to SVN as r4917.
2010-12-08 14:21:45 +00:00
32bb692521
Define typename in the Signal template for FreeBSD as well. I'm not sure why this is required (yet) but we may need it on other platforms as well.
...
Originally committed to SVN as r4916.
2010-12-08 14:20:53 +00:00
819a298246
Add -Wno-variadic-macros to silence "warning: anonymous variadic macros were introduced in C99" with GCC.
...
Originally committed to SVN as r4915.
2010-12-08 13:35:33 +00:00
0e6d8631fd
Add scoped_ptr.h
...
Originally committed to SVN as r4902.
2010-12-07 19:09:37 +00:00
13f052317e
Convert OptionValue over to agi::signal
...
Originally committed to SVN as r4899.
2010-12-07 19:09:15 +00:00
4fc1ff6ad6
Add simple signal/slot implementation loosly based on boost.sigal
...
Originally committed to SVN as r4898.
2010-12-07 19:09:08 +00:00
5a635ebdb3
Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage.
...
Originally committed to SVN as r4895.
2010-12-05 19:12:42 +00:00
75285192a3
Add overloaded operator-> to agi::line_iterator
...
Originally committed to SVN as r4846.
2010-11-17 05:44:02 +00:00
1f894561c3
Actually set options' default values
...
Originally committed to SVN as r4842.
2010-11-11 04:48:37 +00:00
b4739d2aee
gcc 4.5 compilation fixes
...
Originally committed to SVN as r4797.
2010-10-11 04:25:02 +00:00
682fd9406c
Check for both forward and back slashes in the windows version of util::DirName
...
Originally committed to SVN as r4792.
2010-10-07 17:18:00 +00:00
1dedfb18cd
Shift timecodes so that frame 0 always starts at time 0, as nothing related to audio supports non-zero start times
...
Originally committed to SVN as r4791.
2010-09-23 03:06:22 +00:00
fd5c1ecffc
Fix writing of newlines on windows in charsets wider than one byte
...
Originally committed to SVN as r4786.
2010-09-15 05:00:12 +00:00
035694c9ae
I came, I saw, I hurfed a durf about macro redefinitions
...
Originally committed to SVN as r4781.
2010-09-14 23:53:22 +00:00
3512c4e1fe
Clean up handling of fallbacks and improve behavior somewhat with glibc iconv
...
Originally committed to SVN as r4776.
2010-09-09 06:47:50 +00:00
81709164b3
Make the detection of BOM sizes actually work
...
Originally committed to SVN as r4774.
2010-09-09 06:47:29 +00:00
0248e7c754
Add listeners for most non-audio options that need them. Closes #1047 .
...
Originally committed to SVN as r4764.
2010-08-26 18:38:37 +00:00
714fa65071
Rename 2.2 to 3.0 as this will now be the next version outside of 2.1.
...
Originally committed to SVN as r4747.
2010-08-15 18:40:58 +00:00
b50255bfe9
Re-add code removed in r4745 and conditionalise it under BUILD_DARWIN.
...
Originally committed to SVN as r4746.
2010-08-15 16:55:52 +00:00
2bcaf14892
Remove some test code added when fixing the OSX build that slipped into r4743.
...
Originally committed to SVN as r4745.
2010-08-14 18:57:29 +00:00
3c5d4bc97e
Relicense libosxutil code (osx/util.cpp and include/util_osx.h) using the same license as the rest of the library. (obsd/2-clause bsdl) Done with the permission of current copyright holder jfs (Niels Martin Hansen).
...
Originally committed to SVN as r4744.
2010-08-14 18:45:41 +00:00
d4ba1f48ca
Remove libosxutil and fold it into libaegisub.
...
Originally committed to SVN as r4743.
2010-08-14 17:42:37 +00:00
46be23073e
Fix a few gcc warnings
...
Originally committed to SVN as r4722.
2010-08-02 20:25:29 +00:00
6407e36c87
Store inner exceptions with shared_ptr rather than a bare pointer so that the inner exception survives copies
...
Originally committed to SVN as r4714.
2010-07-27 03:52:32 +00:00
79a67ae1ec
Add some log messages when subscribing/unsubscribing emitters.
...
Originally committed to SVN as r4711.
2010-07-25 17:30:12 +00:00
fde4a7815d
Make the subtitle edit box auto-commit all changes
...
This happens to fix most of the undo issues, as it's now much harder to
have uncommitted changes to the file.
Closes #355 and #586 .
Originally committed to SVN as r4699.
2010-07-20 03:11:11 +00:00
c624b20777
Left align microseconds by 6 spaces.
...
Originally committed to SVN as r4683.
2010-07-17 17:47:59 +00:00
ab27440853
Fix comment in vfr.cpp
...
Originally committed to SVN as r4672.
2010-07-11 03:31:28 +00:00
a59d2a8e2e
Fix 64-bit compilation errors
...
Originally committed to SVN as r4663.
2010-07-08 04:50:46 +00:00
acba2c6b63
Rewrite VFR handling in Aegisub.
...
Kill vfr.h and vfr.cpp and use the libaegisub versions of them instead.
Rather than the globals VFR_Input and VFR_Output, everything related to
frame rate is now part of the video context. Most things which used to
use VFR_Output now call VideoContext::TimeAtFrame etc.; video providers,
rather than modifying VFR_Input directly, now have getters for their
frame rates which VideoContext calls. Read-only public access to
VFR_Input and VFR_Output are still provided (hopefully temporarily) for
a few things which were awkward to do through VideoContext.
The Avisynth provider now might correctly handle VFR MKVs which can be
opened with DirectShowSource but not DSS2.
Rework keyframe handling as well, so that it continues to match the vfr
handling in design and implementation.
Originally committed to SVN as r4662.
2010-07-08 04:29:04 +00:00
9322f95071
Rewrite vfr.cpp in libaegisub with tests. Not yet used by Aegisub itself.
...
Originally committed to SVN as r4661.
2010-07-07 05:24:16 +00:00
929fa83dd9
Move the bulk of TextFileWriter's logic to libaegisub.
...
Originally committed to SVN as r4660.
2010-07-07 02:41:46 +00:00
02237f2a7a
Make the std::string overloads of IconvWrapper::Convert significantly faster
...
Originally committed to SVN as r4659.
2010-07-07 02:41:40 +00:00
5ed8bf89f6
Fix gcc build errors
...
Originally committed to SVN as r4658.
2010-07-06 19:33:09 +00:00
d7ad7e861f
Fix occasional truncation problems with Windows-1258
...
Originally committed to SVN as r4657.
2010-07-06 19:23:16 +00:00
6623239682
Work around BOM-related issues with UTF-32 and UTF-16 with unspecified byte order
...
Originally committed to SVN as r4656.
2010-07-06 19:23:10 +00:00
ee4c5dee0b
Remove charsets which libiconv does not support from charsets.def
...
Originally committed to SVN as r4655.
2010-07-06 19:23:01 +00:00
cac536fc80
On Windows, send debug logging to the debugger rather than stdout.
...
Originally committed to SVN as r4642.
2010-06-29 23:08:42 +00:00
8e912e3ff6
Include <algorithm> to get std::for_each
...
Originally committed to SVN as r4587.
2010-06-24 01:51:18 +00:00
b5ed0d6c8c
wrap config.h include under LAGI and put -DLAGI when compiling to ensure it's only included when building libaegisub.
...
Originally committed to SVN as r4585.
2010-06-24 01:49:48 +00:00
4f53324ca3
Add the name of the option to OptionValue's error messages
...
Originally committed to SVN as r4582.
2010-06-24 01:24:49 +00:00
2b47f34e76
Fix a pile of actual memory leaks
...
Originally committed to SVN as r4575.
2010-06-24 01:24:09 +00:00
cbf201ab86
Fix some "leaks" of things that should actually be alive for the lifetime of the program to reduce noise.
...
Originally committed to SVN as r4574.
2010-06-24 01:24:02 +00:00
4bb8e8ea22
Merge r4550: remove wx headers.
...
Originally committed to SVN as r4572.
2010-06-23 13:20:24 +00:00
afec51c4ed
Include config.h in lagi_pre.h so that the conditional inclusion of sys/time.h actually works
...
Originally committed to SVN as r4543.
2010-06-18 06:59:55 +00:00
75bd20a6dd
Fix the rest of the build errors when not using precompiled headers
...
Originally committed to SVN as r4530.
2010-06-17 00:23:44 +00:00
61138e9b5d
Add configure check for sys/time.h
...
Originally committed to SVN as r4529.
2010-06-16 07:49:35 +00:00
5338a60cdb
Fix compilation errors when not using precompiled headers
...
Originally committed to SVN as r4511.
2010-06-14 19:26:27 +00:00
340cc1d7f1
Fix compilation with precompiled headers disabled.
...
Originally committed to SVN as r4504.
2010-06-14 18:02:58 +00:00
d8a9bac4b0
Handle the lack of a pre-existing config file.
...
Originally committed to SVN as r4489.
2010-06-13 01:29:32 +00:00
60b9e5dee6
Define _X86_ so univeralchardet builds properly, this eventually needs to be fixed to use the autodetection code already in configure.in
...
Originally committed to SVN as r4486.
2010-06-12 07:04:46 +00:00
de974fb723
Cast the correct parameter when ICONV_POSIX is defined
...
Originally committed to SVN as r4474.
2010-06-11 02:25:13 +00:00
612b583e2b
Move cajun includes into the cpp files rather than headers so that only files in libaegisub include them.
...
Originally committed to SVN as r4473.
2010-06-11 02:25:07 +00:00
ea577f8245
Re-work types.h for the second time, this is most likely not the final version, it's difficult to figure out a solution that makes the most sense when most of the code hasn't been written/moved over yet.
...
Originally committed to SVN as r4468.
2010-06-09 02:07:43 +00:00
931cc7f461
* Remove all instances of wxLogDebug and replace them with LOG_W, LOG_D, LOG_E and LOG_D_IF as required.
...
* Add LOG_(D|W|I)_IF for conditional logging.
Originally committed to SVN as r4465.
2010-06-08 23:21:39 +00:00
059a554d95
Include ../config.h to get AGI_ICONV_CONST from acconf.h.
...
Originally committed to SVN as r4450.
2010-06-06 03:01:04 +00:00
b49ea0af6f
Conditionally const_cast source pointers passed to iconv to avoid invalid cast warnings
...
Originally committed to SVN as r4449.
2010-06-06 02:53:02 +00:00
2aeb0bdffb
Sigh, -ansi isn't the solution since other compilers may define 'unix', for now the namespace has been called u_nix, hopefully this is safe but who knows...
...
Originally committed to SVN as r4445.
2010-06-06 02:32:50 +00:00
acc9e53714
Remove stray ;'s
...
Originally committed to SVN as r4444.
2010-06-05 23:44:07 +00:00
b01855ecbd
Add -ansi to CPPFLAGS which stops GCC from being stupid and defining unprefixed pp macros (such as "unix"), while i'm here add -pedantic
...
Originally committed to SVN as r4443.
2010-06-05 23:42:49 +00:00
2d9eee4ea9
Add struct tm which mimics the struct on unix. Also setup the types file into seperate namespaces for clarity. The corrosponding change to windows/utils.cpp snuck into r4437.
...
Originally committed to SVN as r4438.
2010-06-05 18:17:55 +00:00
1a7052040a
Remove useless whitespace, I need to setup msvc to disable all it's auto-indentation features which are terrible.
...
Originally committed to SVN as r4437.
2010-06-05 18:16:16 +00:00
abe6c734f4
Add dependency on iconv.
...
Originally committed to SVN as r4433.
2010-06-04 13:01:31 +00:00
b6d29443a3
Move most character set conversion code to libaegisub and make everything use the new conversion functionality.
...
Originally committed to SVN as r4423.
2010-06-03 20:32:25 +00:00
401560b190
Add some debug trace info.
...
Originally committed to SVN as r4418.
2010-06-03 18:09:00 +00:00
709718ffb6
Lesson: Don't code when tired.
...
Make a complete function call of the notify loop body, instead of some half syntax.
Originally committed to SVN as r4417.
2010-06-03 18:08:23 +00:00
1768a8138d
Whoops, remove an artifact that remained when debugging: don't delete the message buffer.
...
Originally committed to SVN as r4416.
2010-06-03 08:32:42 +00:00
5e8d5b221b
Compiling, but untested, option change notifications. Doesn't seem to affect Aegisub aversely.
...
Has the limitation that one object can only subscribe once to one option value, but that shouldn't actually be a problem. (One object cannot have two different of its member functions subscribing to one option value.)
Originally committed to SVN as r4415.
2010-06-03 05:07:47 +00:00
86a3d0792a
Move */ up one line so it doesn't catch the closing brace for EmitSTDOUT::log
...
Originally committed to SVN as r4411.
2010-06-03 01:18:12 +00:00
61ee7ce92d
Fill in time_log() with code from http://www.suacommunity.com/dictionary/gettimeofday-entry.php <-thanks!
...
Originally committed to SVN as r4409.
2010-06-03 01:09:41 +00:00
fc9e01c68a
* Forward declare the LogSink global
...
* Change GetSink() to return a const pointer.
Originally committed to SVN as r4405.
2010-06-02 23:45:51 +00:00
33011cb5ed
Split EmitterSTDOUT into unix/log.cpp and windows/log.cpp, the windows version is commented at the moment.
...
Originally committed to SVN as r4397.
2010-06-01 08:17:27 +00:00
139f675ede
Add a return value to LogSink::Subscribe to make msvc happy.
...
Originally committed to SVN as r4396.
2010-06-01 08:08:33 +00:00
7e83443c3e
Fix the Windows build, there are a couple of things to note:
...
* I rebroke the stdout logger I'll fix that in unix.
* There is a new header libaegisub/types.h which is a temp solution until I sort out something more realistic. It's too early to tell what the proper solution will be.
Originally committed to SVN as r4394.
2010-06-01 08:03:17 +00:00
badee30d17
Sigh, not diffing before committing bites me again: remove useless deltas that shouldn't have been committed.
...
Originally committed to SVN as r4392.
2010-06-01 05:14:00 +00:00
37b904b75e
Create time_log() to return a timeval so I can implement this on windows as well.
...
Originally committed to SVN as r4391.
2010-06-01 05:11:18 +00:00
3ff3fdf4cc
Fix the stdout print to make it more readable..
...
Originally committed to SVN as r4376.
2010-05-31 23:16:16 +00:00
0a453fe127
Move Serverity_ID below the definition of log where it should be.
...
Originally committed to SVN as r4373.
2010-05-31 22:47:38 +00:00
9d0c5a4890
Add Googles mutex.h which seems to be used in many of googles projects. It's better to use something that's well-tested rather than rolling our own. Also a huge time saver.
...
Originally committed to SVN as r4372.
2010-05-31 21:57:08 +00:00
9393850884
Commit the beginings of a logging api, this is fairly complete however it has no locking.
...
Originally committed to SVN as r4371.
2010-05-31 20:55:29 +00:00
9d854b69f3
Don't bother storing storing a single charset into an std::string, instead insert it into the std::map and fix Single() to return the first element. This keeps things simple and also ensures that DetectAll() will always return atleast one element which wasn't being done before.
...
Originally committed to SVN as r4369.
2010-05-28 13:08:00 +00:00
6736f5e292
Add a change that was missed in r4367.
...
Originally committed to SVN as r4368.
2010-05-28 08:04:55 +00:00
e408fe49c9
Add support for detecting character sets using UniversalChardet -- this superceeds character_detect.cpp.
...
Originally committed to SVN as r4367.
2010-05-28 07:40:21 +00:00
2d57debd49
Commit the beginings of the Path class to hold the internal representation of paths, this is extremely rough since I have to wait until we can do charset conversion in libaegisub to handle windows paths before going any further.
...
Originally committed to SVN as r4359.
2010-05-24 17:57:07 +00:00
25497cf87d
Completely remove the usage of POSIX functions from Acs. I've discovered the hard way that most things POSIX on Windows is a complete disaster.
...
With this we're now using native functions and all unit tests pass.
The code used in Check() is still a proof of concept and will probably be rewritten as issues are exposed.
Originally committed to SVN as r4354.
2010-05-23 20:39:14 +00:00
0dc6a082ca
Fix memory leaks in Option
...
Originally committed to SVN as r4349.
2010-05-23 06:58:11 +00:00
60a1bdc2df
Fix memory leaks in mru.cpp
...
Originally committed to SVN as r4348.
2010-05-23 06:58:06 +00:00
9fc28fc1d4
Make MRUManager::Remove work
...
Originally committed to SVN as r4347.
2010-05-23 06:58:01 +00:00
f7f59e5e1d
Add an ErrorString utility which converts the code from GetLastError() into a human readable std::string.
...
Originally committed to SVN as r4345.
2010-05-22 21:09:37 +00:00
d3c33d5e7c
Fix file saving on Windows.
...
Originally committed to SVN as r4333.
2010-05-21 03:07:48 +00:00
cd8305987b
Wrap io.h with _MSC_VER since it's only needed on windows. Eventually we'll have to create our own set of defined macros for various platforms.
...
Originally committed to SVN as r4332.
2010-05-21 01:19:40 +00:00
40e12403d5
Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format.
...
Initial support for low-level access and file I/O methods are included as well.
Originally committed to SVN as r4331.
2010-05-21 01:13:36 +00:00
Amar Takhar