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

43 commits

Author SHA1 Message Date
Thomas Goyne
1285584e89 Add ?local for the user's local config dir; use it for FFMS2 indexes 
Originally committed to SVN as r6235.
 2012-01-08 01:34:57 +00:00
Thomas Goyne
3efdef2224 Tweak a few strings to make them easier to translate 
Originally committed to SVN as r6211.
 2012-01-08 01:05:13 +00:00
Thomas Goyne
f2c62dad3d Factor out a bunch of duplicated code in the configure script for pkg-config based optional dependencies and use the pkg-config name for all WITH_* defines 
Originally committed to SVN as r6104.
 2011-12-22 21:25:49 +00:00
Thomas Goyne
92949bc965 Remove AegisubApp::Get, as wxGetApp() does the same thing 
Originally committed to SVN as r6051.
 2011-12-22 21:17:30 +00:00
Thomas Goyne
53b6765dd8 Redesign DialogProgress 
Add agi::ProgressSink and agi::BackgroundRunner interfaces to libaegisub
which represent a generic progress sink and a thing which calls funtions
that need progress sinks. Make DialogProgress implement
agi::BackgroundRunner, invoking the passed function on a worker thread
and giving it a progress sink to update the dialog with.

Rewrite Automation4::ProgressSink, LuaThreadedCall and all related
classes to be based on agi::ProgressSink. Automation now simply uses
DialogProgress (although that's merely an implementation detail) and
adds a single method to route dialog opening from the worker thread to
the GUI thread.

Originally committed to SVN as r5634.
 2011-09-28 19:47:40 +00:00
Thomas Goyne
cc147d1660 Eliminate uses of c_str made unnecessary by changed to wxString::Format in wx 2.9 
Originally committed to SVN as r5612.
 2011-09-28 19:43:48 +00:00
Thomas Goyne
d990bbbb99 Eliminate all unnecessary uses of L and _T 
Originally committed to SVN as r5611.
 2011-09-28 19:43:11 +00:00
Thomas Goyne
3345797ff6 Use signals in AudioController and AudioTimingController 
Originally committed to SVN as r4907.
 2010-12-08 08:09:16 +00:00
Amar Takhar
c15777f844 Merge audio_display_rewrite branch to trunk. This is not a complete work, don't expect to time anything for a while. 
Originally committed to SVN as r4903.
 2010-12-08 03:36:10 +00:00
Karl Blomster
0c2b40dc60 Revert r4782 since it wasn't needed if you do the project file right. 
Originally committed to SVN as r4783.
 2010-09-15 00:18:21 +00:00
Karl Blomster
3bdba76549 I have no idea what kind of enterprising faggot broke this but apparently we need __STDC_FORMAT_MACROS now. I hope this breaks on some other platform, that would be hilarious. 
Originally committed to SVN as r4782.
 2010-09-15 00:01:59 +00:00
Thomas Goyne
574236875c Fix assertion failure in 32-bit builds 
Originally committed to SVN as r4753.
 2010-08-25 19:31:26 +00:00
Thomas Goyne
c10e9e3a5b Make video and audio providers throw typed exceptions. 
Don't display error messages and try other providers when the user
cancels loading a file.

Remove files from the MRU lists if they can't be found.

Closes #717.

Originally committed to SVN as r4717.
 2010-08-02 06:32:01 +00:00
Amar Takhar
d3e9a906aa Use %ld for both wxFileOffset (off_t) and GetTicks() (time_t), also coalesce into a single wxString::Format. This fixes an assert in wx trunk. Unfortunatly it does not fix audio loading due to seperate breakage of libass in r4630:4631. closes #1228. 
Originally committed to SVN as r4681.
 2010-07-16 10:33:54 +00:00
Thomas Goyne
4a8abae3a3 Kill options.h and options.cpp, which have been empty for a while 
Originally committed to SVN as r4676.
 2010-07-12 21:49:48 +00:00
Amar Takhar
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
Thomas Goyne
90893f1048 Make the capitalization of FFmpegSource in options consistent, as option names are now case-sensitive. 
Originally committed to SVN as r4414.
 2010-06-03 05:07:10 +00:00
Amar Takhar
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
Karl Blomster
85d645b44a Allow user to set behavior of audio decoding errors during indexing with the FFMS2 providers. 
Originally committed to SVN as r3822.
 2009-11-28 21:13:47 +00:00
Karl Blomster
6490c82e79 Change the way ffms2 index cache files are named to use source filename (without path) + source file's size in bytes + source file modification time, instead of just source file path + size in bytes, in order to make reusing index cache files on other computers easier. Closes #1008. 
Originally committed to SVN as r3582.
 2009-09-27 00:32:19 +00:00
Karl Blomster
9d80eb066f Updating ffms2 to r221 (2.12), step 3/3: Aegisub interface 
Originally committed to SVN as r3576.
 2009-09-26 21:58:00 +00:00
Amar Takhar
88276ed1f4 * Move some headers below the rest as they need wx settings that don't seem to be inited when the header is first in the list. 
* Add some missing headers and reposition one from the file to header.
 * Revert r3516 as it's no longer needed.

Originally committed to SVN as r3518.
 2009-09-10 22:48:29 +00:00
Amar Takhar
d455a61732 Set wxUSE_CHOICEDLG to 1, I don't know why this is required I'll look at it later. 
Originally committed to SVN as r3516.
 2009-09-10 13:43:31 +00:00
Amar Takhar
d348b4e33e Fix all the headers in *.cpp, this includes: 
* Wrapping all headers that are in agi_pre.h with AGI_PRE.
 * Sorting alphabetically.

Originally committed to SVN as r3515.
 2009-09-10 13:06:40 +00:00
Amar Takhar
7a8c5229fd * Remove wxprec.h from all files other than agi_pre.h. Including this in various headers is useless as it includes wx.h which includes dozens of 'common' wx headers. With this we're unable to tell which files rely on which interfaces. This commit removes them and manually places in required headers as-needed. 
* Update agi_pre.h to include some missing headers, also move required windowsheaders to the top of the list
 * Use <> versus "" for the wx header in avisynth_wrap.cpp
 * Remove xx/wx.h from agi_pre.h as it's included by wxprec.h.

Originally committed to SVN as r3513.
 2009-09-10 10:26:50 +00:00
Karl Blomster
ad4a44a22b Document ffmpegsource_common.cpp/h. 
Originally committed to SVN as r3363.
 2009-08-05 11:21:00 +00:00
Amar Takhar
718b1ca94a Fix a bunch of Doxygen warnings, two more left! 
Originally committed to SVN as r3347.
 2009-08-01 03:26:09 +00:00
Amar Takhar
2fcd872218 Kill the ffms2 group and make it all 'ffms' 
Originally committed to SVN as r3335.
 2009-07-30 06:40:25 +00:00
Amar Takhar
6ee2f98349 Note: This was done using a script! it's far from perfect but 95% of the work has been done already formatting-wise. 
Document all functions, class, struct, union, enum, macro, variable, typedefs.  This isn't the actual document in itself but empty documentation using any old documentation if it was there.

This was done using exuberant ctags to get tag info, then a TCL script to parse/remove old comments and convert them into Doxygen-style.

Some notes:
 * Anything labeled 'DOCME' needs to be documented, @param and @return have been left blank as it would be annoying to delete the 'DOCME' from every one of those.
 * Some multiline comments may have been munged into single line comments
 * Leave the /// comments above global variables with a space, if they're harder to read then we'll be less likey to use them.
 * Enum comments can go after the enumeration itself '[value] /// comment'
 * include/aegisub/*.h haven't been converted yet, this will be done in a later commit
 * Some documentation blocks are in the wrong place, in the .h when it should be in the .cpp, or vice versa.

See http://devel.aegisub.org/wiki/Doxygen for some details on Doxygen and a 'style guide'.

Originally committed to SVN as r3312.
 2009-07-29 22:59:22 +00:00
Amar Takhar
12aa34088a Switch all headers to using Doxygen and cleanup contact info 
* Swap old email + website address with 'Aegisub Project http://www.aegisub.org/'
 * Set categories for all files (jfs)
 * Add descriptions for each file (jfs)
 * Add $Id$ keyword

Originally committed to SVN as r3310.
 2009-07-29 05:43:02 +00:00
Karl Blomster
f066903d98 FFMS2 a/v providers should use UTF8 strings for the cache filenames, just like for every other file. Updates #955 but does not fix it since you still get bizarre popups that I have no idea where they're coming from if the write/touch operations fail. 
This change should be merged into 2.1.8.

Originally committed to SVN as r3294.
 2009-07-26 23:10:12 +00:00
Karl Blomster
f59dcf19f6 Add option to set FFMS2 logging level (i.e. how much spam FFmpeg prints to STDERR). 
Option is called "ffmpegsource log level" and possible values are (in order of increasing spam) quiet, panic, fatal, error, warning, info, verbose, debug. The default is quiet, and I strongly recommend avoiding anything above warning.

Originally committed to SVN as r3248.
 2009-07-24 01:41:16 +00:00
Amar Takhar
0f6977fa39 Fix a cast issue in GetCacheFilename under wx2.9.. fix by jfs, thanks! 
Originally committed to SVN as r3221.
 2009-07-23 15:37:47 +00:00
harukalover
ac33243a49 Fixed compilation with wxWidgets 2.9.0 again plus removed some unneeded #if's (wc_str is the same as c_str under 2.8) 
Originally committed to SVN as r3191.
 2009-07-22 19:52:59 +00:00
Karl Blomster
58539b885d Replace FFMSTrackMask[All|None] with #defines instead. (Was causing linking problems with some compilers for some reason). 
Originally committed to SVN as r3155.
 2009-07-16 21:40:17 +00:00
Karl Blomster
c33ed91b12 Implement support for multiple tracks in the FFMS2 audio and video providers. Files with more than one audio or video track will now let the user pick which one he/she wishes to load. Closes #905. 
Originally committed to SVN as r3145.
 2009-07-16 14:48:47 +00:00
Karl Blomster
a45282bfbb Update the FFMS2 audio and video providers to use the new API features. 
Originally committed to SVN as r3116.
 2009-07-13 22:30:48 +00:00
harukalover
4eeb89710d Fixed compilation support with wxWidgets 2.9.0 (seems to work correctly besides some minor gui issues) 
Originally committed to SVN as r3049.
 2009-06-11 23:30:33 +00:00
Karl Blomster
a3ad037940 Fix ffms2 providers to work with latest FFMS2 API changes. 
Originally committed to SVN as r2974.
 2009-05-22 21:44:02 +00:00
Karl Blomster
5717f81ef2 Update FFMS2 providers to account for FFMS2 API change in last commit. 
Also update ffms2.lib to corresponding version.

Originally committed to SVN as r2948.
 2009-05-17 22:12:46 +00:00
Niels Martin Hansen
ef407b6e68 Make FFmpegSource video and audio providers build again after FFMS2 changes last night. 
Originally committed to SVN as r2944.
 2009-05-16 12:47:23 +00:00
Karl Blomster
c84a79fb7f Implemented an automated cache cleaner that keeps the FFMS2 index cache at a manageable size. Cleaning is started when video is opened with the FFMS2 video provider and runs in its own thread. Removal is based on last access time, and the FFMS2 providers now explicitly touch the index files on reading to make sure access time is updated. 
By default the cache is kept below 42MB and 20 files; to change the defaults change "FFmpegSource max cache size" and "FFmpegSource max cache files" in config.dat. Either or both may be set to 0, but the cleaner will not delete the last index file in the directory, regardless of cache settings and of the file's size.

Originally committed to SVN as r2893.
 2009-05-03 18:05:30 +00:00
Amar Takhar
91d73ec8ea SVN Transition Step 3/7 
1. cd aegisub/
  2. svn mv *cpp *h src/
  3. svn mv Makefile.am MatroskaParser.c auto4_perldata.inc bitmaps boost \
     changelog.txt config gl include libosxutil libresrc md5.c msvc mythes.cxx \
     mythes.hxx res.rc src/
  4. cd ..
  5. svn mv FFmpegSource2/ INSTALL Makefile.am README  acinclude.m4 \
     autogen.sh automation/ bin build configure.in desktop dummy.txt lib \
     libass/ m4macros/ packages/ po/ scripts/ universalchardet/ aegisub/
  6. mkdir -p docs/wiki_convert
  7. svn add docs/wiki_convert
  8. cd docs
  9. svn mv aegisub_convert_docs.pl convert.bat output wiki_convert/

* See r2749 for full description.

Originally committed to SVN as r2752.
 2009-03-08 08:30:39 +00:00
Renamed from aegisub/ffmpegsource_common.cpp (Browse further)