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

1161 commits

Author SHA1 Message Date
Karl Blomster
bc675ea7dd explicitly tell swscaler which scaling method to use (required by newer ffmpeg versions; no actual scaling is done, only colorspace conversion) 
Originally committed to SVN as r2294.
 2008-08-03 16:52:54 +00:00
Niels Martin Hansen
7342c2b617 Fix search/replace deleting part of line following the last match on that line. Also a minor optimisation. 
Originally committed to SVN as r2280.
 2008-07-23 16:09:27 +00:00
Niels Martin Hansen
c3c29518d4 Untested patch: Remove all traces of the update checker from non-Windows builds, since it causes more problems than it solves on those. 
Originally committed to SVN as r2277.
 2008-07-22 20:55:24 +00:00
Niels Martin Hansen
741476c96d Correct spelling error 
Originally committed to SVN as r2274.
 2008-07-22 00:33:25 +00:00
Niels Martin Hansen
7b110725d1 Oops, r2270 broke the build, missing a backslash in a string. 
Originally committed to SVN as r2271.
 2008-07-20 13:45:10 +00:00
Niels Martin Hansen
30a9bdc17c Implement/fix #751 and update changelog a bit. 
Originally committed to SVN as r2270.
 2008-07-20 13:34:42 +00:00
Niels Martin Hansen
eb5e8ea8a1 Corrections for TranStation export support. Format written was incorrect (a space placed on the wrong side of a bracket). Also added full support for alignments, and subtracting one frame from end times to avoid overlaps 
Originally committed to SVN as r2269.
 2008-07-18 21:10:48 +00:00
Niels Martin Hansen
94011adf93 Fix SMPTE timecode formatting, never round frame up to avoid things like frame 30 in a second in a 30 fps movie, where frame numbers go from 0 to 29. 
Originally committed to SVN as r2268.
 2008-07-18 20:43:07 +00:00
Niels Martin Hansen
270ca4f876 Rewrite recombining of overlapping lines for export to simple subtitle formats, and reorganisation of other functions also used in those exports 
Originally committed to SVN as r2267.
 2008-07-18 15:39:34 +00:00
Rodrigo Braz Monteiro
2d7b2527a7 OMFG AMZ IS ALIVE! Partial TranStation export support (SMPTE drop-frames seem to be broken, and line merging isn't working) 
Originally committed to SVN as r2266.
 2008-07-18 01:36:20 +00:00
Karl Blomster
0badb4059f Restructured audio providing a bit. If a provider cannot provide 16-bit mono audio with a sample rate higher than 32kHz, an intermediate converting provider will be inserted to fix it. Made the lavc audio provider rely on this for downmixing instead of doing it with libavcodec (used to fail on audio with >2 channels). 
Originally committed to SVN as r2265.
 2008-07-16 13:22:06 +00:00
Niels Martin Hansen
2bd33541c1 Fix #745 by explicitly setting the font name combo box value after filling it 
Originally committed to SVN as r2264.
 2008-07-16 12:10:00 +00:00
Niels Martin Hansen
624eb825a7 Fix #746, style editor now shows initial values in spin controls 
Originally committed to SVN as r2263.
 2008-07-16 11:30:53 +00:00
Niels Martin Hansen
dfa3e548a0 Fix colour picker buttons in style editor by making AssColor::GetWXColor() aware that alpha has the opposite meaning in wxColour and ASS 
Originally committed to SVN as r2262.
 2008-07-16 01:41:33 +00:00
Niels Martin Hansen
27e35e9434 Fix current colour display in colour picker dialogue 
Originally committed to SVN as r2261.
 2008-07-16 01:36:38 +00:00
Niels Martin Hansen
9c51d15a99 Fix recent colours box in colour picker on Mac 
Originally committed to SVN as r2260.
 2008-07-16 01:29:36 +00:00
Karl Blomster
e8dffb60ec add audio_provider_downmix.cpp to Makefile.am 
Originally committed to SVN as r2259.
 2008-07-15 22:49:02 +00:00
Karl Blomster
6bec0322e4 split out the downmixing audio provider into its own .h/.cpp, in preparation for using it in the ffmpeg audio provider. 
Originally committed to SVN as r2257.
 2008-07-15 21:31:09 +00:00
Niels Martin Hansen
d120a4758b Fix bug #742 and possibly also #465. Needs testing on non-Mac platforms to see if there's visual glitches with video visual typesetting toolbar. 
Originally committed to SVN as r2256.
 2008-07-15 17:49:15 +00:00
Karl Blomster
a836b89476 cosmetics and cleanup of unused code in video_provider_lavc.cpp 
Originally committed to SVN as r2255.
 2008-07-15 14:35:22 +00:00
Karl Blomster
904873f0d9 added option to allow potentially unsafe seeking with the ffmpeg video provider. named "ffmpeg allow unsafe seeking" and defaults to false. 
Originally committed to SVN as r2254.
 2008-07-15 14:24:00 +00:00
Karl Blomster
cdb2227024 unbroke compilation of the directshow video provider, broke with last commit. Patch by Harukalover. 
Originally committed to SVN as r2253.
 2008-07-15 12:44:53 +00:00
Karl Blomster
893ff2f78a Major rewrite of the video providing system. Hilights: 
- It is now the responsibility of each video provider to provide a list of keyframe positions and (if it can) timecodes.
- The ffmpeg video provider now indexes files before opening them and does no longer rely on stream->duration to determine the number of frames. Fixes opening of MKV files, but it does not (currently) open timecodes automatically and reported keyframe positions seem way off. Status of frame-accuracy with MKV files unknown but it may very well work.
- Modified the way the ffmpeg video provider seeks (inspired by code from Myrsloik's ffmpegsource). Should no longer lose the first frame and should also no longer be frame-inaccurate, at least not with AVI.
- DirectShow video provider may or may not be completely broken, not tested.

Originally committed to SVN as r2252.
 2008-07-15 00:08:05 +00:00
Karl Blomster
7e2b6afdf1 typo fix (patch by Harukalover) 
Originally committed to SVN as r2251.
 2008-07-14 22:56:49 +00:00
Karl Blomster
11f316c180 cosmetics and minor adjustments to ffmpeg keyframe reader 
Originally committed to SVN as r2249.
 2008-07-14 00:07:21 +00:00
Karl Blomster
32f7a53a68 vastly improved keyframe reading with ffmpeg, should be much faster and more reliable. 
Originally committed to SVN as r2248.
 2008-07-13 23:45:42 +00:00
Niels Martin Hansen
32cc996ce6 Harukalover's patch for bug #740 
Originally committed to SVN as r2246.
 2008-07-13 15:06:29 +00:00
Karl Blomster
46a6924531 added support for DivX (6.x and possibly 5.x) and x264 2-pass stats file to keyframe reader. 
patch by Harukalover, see bugtracker issue #736.

Originally committed to SVN as r2244.
 2008-07-09 16:48:19 +00:00
Niels Martin Hansen
923b347356 Some more checking in PCM provider. Had apparently missed a way EnsureRangeAceesibleble() could fail. This means of failure should no longer be possible. 
Originally committed to SVN as r2240.
 2008-07-05 12:50:49 +00:00
Karl Blomster
51c9856160 clarified downmixing error in ffmpeg audio provider 
Originally committed to SVN as r2239.
 2008-07-05 11:29:42 +00:00
Niels Martin Hansen
484a179798 Forgot to change the include guard when renaming the file, so <endian.h> defined _ENDIAN_H on some systems and thus aegisub_endian.h had no effect. 
Originally committed to SVN as r2238.
 2008-07-04 12:36:10 +00:00
Niels Martin Hansen
3d13fcfe5f Fix some minor warnings when building on GCC. 
Originally committed to SVN as r2237.
 2008-07-04 12:34:02 +00:00
Karl Blomster
e26b9fe0d5 overhaul of audio_provider_lavc.cpp. should fix the infamous skewing issue, tested and works on windows at least. 
Originally committed to SVN as r2236.
 2008-07-04 12:04:10 +00:00
Niels Martin Hansen
d01b4ec3e9 Yet some more sanity/error checking, although it should never be triggered. 
Originally committed to SVN as r2235.
 2008-07-04 11:59:28 +00:00
Niels Martin Hansen
0d56463aa4 A bit additional commenting and sanity checking in PCM provider. 
Originally committed to SVN as r2234.
 2008-07-04 11:37:45 +00:00
Karl Blomster
a1574d0a5f milisecond -> millisecond (patch by harukalover) 
Originally committed to SVN as r2233.
 2008-07-04 03:40:57 +00:00
Niels Martin Hansen
155388b456 Add secret option to disable use of the PCM provider, mainly intended for debugging: "Audio Disable PCM Provider" (default is false ie. PCM provider enabled) 
Originally committed to SVN as r2232.
 2008-07-04 03:24:25 +00:00
Niels Martin Hansen
2c7da25e91 Avoid strncmp() for checking fourCC codes and use a handcrafted function for it instead. Also add some assertions for null pointer checks. 
Originally committed to SVN as r2231.
 2008-07-04 03:06:55 +00:00
Niels Martin Hansen
a4fc3e8b13 Use compiler-specific defines when building universal for OS X to detect correct endianness and avoid using dynamic endian code for no reason. 
Originally committed to SVN as r2230.
 2008-07-04 01:05:16 +00:00
Karl Blomster
075bc5ec75 revert r2216 (changes to the libav* includes) 
Originally committed to SVN as r2228.
 2008-07-04 00:20:14 +00:00
Niels Martin Hansen
5c2e749421 Forgot to inline the dynamic endian code. 
Originally committed to SVN as r2227.
 2008-07-03 23:38:44 +00:00
Karl Blomster
910ff2e34e the "impossible" audio error is now really impossible 
Originally committed to SVN as r2226.
 2008-07-03 23:27:06 +00:00
Niels Martin Hansen
0fbe0a001f Don't use uint32_t in functions working on uint64_t, shifting uint32_t by 56 bits causes evil compiler warnings. On some compilers! 
Originally committed to SVN as r2225.
 2008-07-03 23:24:47 +00:00
Karl Blomster
d6ada6f0bd black magic for building with ffmpeg on windows 
Originally committed to SVN as r2224.
 2008-07-03 15:22:25 +00:00
Niels Martin Hansen
d1b8355ff2 Rename endian.h to aegisub_endian.h to avoid clash with system headers on some systems. 
Originally committed to SVN as r2223.
 2008-07-03 13:35:23 +00:00
Niels Martin Hansen
a7b64fe694 Make PCM WAV reading (almost) machine endian neutral. The actual sample data read are still assumed to be in machine endian, which will produce garbage output on big endian archs. 
Originally committed to SVN as r2222.
 2008-07-03 02:22:18 +00:00
Niels Martin Hansen
8384e83e71 Add functions to address endianness problems. 
The configure.in script should be adjusted to define appropriate preprocessor tokens. Windows developers should update their config.h.

Originally committed to SVN as r2221.
 2008-07-03 01:56:26 +00:00
Niels Martin Hansen
67bfd70f82 Add a function to remove items from MRU lists, in preparation for a fix for #717. Also a bit of prettyfication of the MRU handling code. 
Originally committed to SVN as r2220.
 2008-07-03 01:53:22 +00:00
Niels Martin Hansen
5a2e91c00a Updated Windows icon to re-made version. The 256x256 version is left uncompressed to be compatible with older RC.exe versions. 
Originally committed to SVN as r2219.
 2008-07-03 00:04:51 +00:00
Niels Martin Hansen
c7ab7c8104 Updated OS X icon, now also with 512x512 size 
Originally committed to SVN as r2217.
 2008-07-02 16:52:25 +00:00
Karl Blomster
40c709da72 change of #includes: <ffmpeg/*> to <libavstuff/*> 
Originally committed to SVN as r2216.
 2008-07-02 16:31:06 +00:00
Niels Martin Hansen
3599e6edd1 Further fixing on-crash message: s/We have tried/I have tried/ 
Originally committed to SVN as r2215.
 2008-07-02 13:50:18 +00:00
Niels Martin Hansen
8217f202e7 Rewritten on-crash messages, hopefully easier to understand and act on now. 
Untested, because I can't find a reliable way to crash Aegisub currently.

Originally committed to SVN as r2214.
 2008-07-02 13:42:34 +00:00
Niels Martin Hansen
f5ded43d51 Applied Harukalover's patch for remembering last subtitle open directory also for files opened from commandline or drag/drop, bug #722. 
Originally committed to SVN as r2212.
 2008-06-24 20:31:23 +00:00
Alysson Souza
79cb1f1bd9 Applied Harukalover's patch - Added an effect field to find and search and replace dialogs 
Originally committed to SVN as r2211.
 2008-06-24 03:22:46 +00:00
Niels Martin Hansen
5330c541ca Possible fix for #719 
Originally committed to SVN as r2210.
 2008-06-21 21:13:00 +00:00
Niels Martin Hansen
36f19a9d42 Fix #688 by moving the time display one line down when in karaoke mode. 
Originally committed to SVN as r2209.
 2008-06-21 18:34:57 +00:00
Niels Martin Hansen
025869468b Fix #704 with a slightly dirty hack. 
Originally committed to SVN as r2208.
 2008-06-21 17:25:00 +00:00
Niels Martin Hansen
59a5e8f3b3 Fix #684, I hope. Redid the case-insensitive Replace All algorithm to replace from a Right side into a Left side, also avoiding use of wx 1.x compatibility functions and doing proper case-insensitive compares rather than searching a lowercased string for a lowercased substring. 
Originally committed to SVN as r2204.
 2008-06-15 17:56:05 +00:00
Niels Martin Hansen
ff081c0ae9 Fix #701, make sure plain-text lines pasted from clipboard are always blank-timed, ie. start and end time are zero. 
Originally committed to SVN as r2202.
 2008-06-15 13:18:28 +00:00
Niels Martin Hansen
51a16f823e Yet another attempt to fix #521, 'Cannot wait for thread termination' in rare cases with the DirectSound audio player. 
Make the playback thread detached so it will kill itself when it has run to end, instead of having to wait for it. This way it is never required to wait for the thread. When the thread has been signalled to stop it is simply abandoned and left to die for itself.

Originally committed to SVN as r2201.
 2008-06-15 12:59:49 +00:00
Niels Martin Hansen
324ce7dbff Be explicit about some type conversions in OpenAL audio player to avoid warnings. Fixes #651. 
Originally committed to SVN as r2200.
 2008-06-15 12:43:56 +00:00
Niels Martin Hansen
1c60d35d16 Fix #695, close Translation Assistant when there are no more lines to translate. 
Originally committed to SVN as r2199.
 2008-06-15 12:20:51 +00:00
Niels Martin Hansen
6f23c635be Left-dragging the selection start marker in the audio display now only restarts the selection after a threshold defined by the Audio Start Drag Sensitivity option. A commented-out editbox for this value is added to the Options dialogue, it is commented out due to the feature freeze towards 2.2.0. 
This should fix #703.

Originally committed to SVN as r2198.
 2008-06-15 12:11:04 +00:00
Niels Martin Hansen
f3fe600714 Improved error reporting in AVIFile keyframe reading code (#715). 
Originally committed to SVN as r2197.
 2008-06-14 22:07:48 +00:00
pstatic
5942928b45 fix bug #595, with spell check 
Originally committed to SVN as r2196.
 2008-06-01 03:44:41 +00:00
pstatic
d65b697e12 Add workaround for what looks like a ffmpeg bug 
Originally committed to SVN as r2194.
 2008-05-21 20:03:39 +00:00
Alysson Souza
4e334cb1d1 oops, forgot to commit hotkeys.cpp 
Originally committed to SVN as r2191.
 2008-05-09 05:03:40 +00:00
Alysson Souza
baf52a3430 Applied Harukalover's patch #2 - Added play audio/video buttons to Styling Assistant 
Originally committed to SVN as r2190.
 2008-05-09 04:27:10 +00:00
Alysson Souza
0de8190b21 Applied Harukalover's patch #1 - Added play audio/video buttons to Translation Assistant 
Originally committed to SVN as r2189.
 2008-05-09 03:43:47 +00:00
Rodrigo Braz Monteiro
8918fb6296 Added a little very specific hacked up tool that isn't enabled unless you modify config.dat. 
Originally committed to SVN as r2185.
 2008-04-21 16:41:46 +00:00
Amar Takhar
b012a3149c Freetype/Fontconfig were pushed under two conditionals beacuse on Darwin we use 
Freetype to list fonts (it uses native features).  When support for glibc iconv
was added the case broke and set $build_linux, the conditional for the
fontconfig font lister was $build_default which no longer got triggered.  Puts
the font listers under FONTLISTER_(FONTCONFIG|FREETYPE) conditional upon
$build_darwin being no/yes.

Originally committed to SVN as r2180.
 2008-04-13 17:44:54 +00:00
Amar Takhar
aa7cc5a2dc Add support for CSRI (ASA), this has been tested and confirmed as working. 
Compiling libass/asa in at the same time is OK.

Originally committed to SVN as r2174.
 2008-04-13 05:10:27 +00:00
Amar Takhar
0734c81d9e Whoops, re-add nuked } after 'extern "C" {' that got removed when the __WINDOWS__ wrap 
was removed.

Originally committed to SVN as r2173.
 2008-04-13 04:47:33 +00:00
Amar Takhar
0607976605 Remove the __WINDOWS__ around 'include "../libass/ass.h"', I didn't notice this 
on my system since I have ass/ass.h in /usr/local/include.  The header hasn't
changed so no damage done, unless you don't have libass installed.

Originally committed to SVN as r2169.
 2008-04-06 15:08:43 +00:00
Niels Martin Hansen
58788ea5ce Change default ALSA output device to something more sensible, namely 'default:0'. 
Originally committed to SVN as r2162.
 2008-03-31 17:55:21 +00:00
Amar Takhar
7746efa54e * Fix ICONV_CFLAGS / ICONV_LDFLAGS so they're properly propogated during the 
build.
* s/ICONV_LIBS/ICONV_LDFLAGS/ to fix the addtion of ICONV_LDFLAGS during final
  linking.

Originally committed to SVN as r2159.
 2008-03-30 08:08:43 +00:00
Amar Takhar
0cf6fce7de Add -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries to 
aegisub_LDFLAGS, for now we don't do any GL link checks so there is no point in
adding it to configure.

Originally committed to SVN as r2158.
 2008-03-30 06:35:00 +00:00
Amar Takhar
cfa2003553 Sigh, really fix the typo(s). 
Originally committed to SVN as r2157.
 2008-03-30 06:17:08 +00:00
Amar Takhar
cc25285ddd Fix typo that slipped into previous commit. 
Originally committed to SVN as r2156.
 2008-03-30 06:13:36 +00:00
Amar Takhar
ad63c0fbac Add a check for avutil, conditional on BUILD_DARWIN which is required on OSX. 
Originally committed to SVN as r2155.
 2008-03-30 06:11:45 +00:00
Amar Takhar
0fb1fee1a8 * Add target platform detection, at the moment this only uses OS info. 
* Fix font_file_lister to use fontconfig for unix, freetype for OS X
* Set bevelbutton to be conditional for Darwin only. (this fixes the header
  missing header as well)

Originally committed to SVN as r2152.
 2008-03-29 22:30:30 +00:00
Amar Takhar
b7af0a06d5 * Add a detection for platform/arch. 
* Add a new condtitional BUILD_DARWIN for fontconfig/freetype font listing
  support.

Originally committed to SVN as r2150.
 2008-03-26 23:58:39 +00:00
Niels Martin Hansen
abeaf06776 Possible fix for bevelButton problem 
Originally committed to SVN as r2149.
 2008-03-26 23:28:12 +00:00
Amar Takhar
3cd825e98b c_str() on _filename. 
Originally committed to SVN as r2147.
 2008-03-25 23:51:54 +00:00
Amar Takhar
91c641789f Remove #ifdef __APPLE__ glue, this will be the same as UNIX, eventually. 
Originally committed to SVN as r2146.
 2008-03-25 23:43:28 +00:00
Amar Takhar
ffaac724e1 Remove a !defined(__APPLE__) around #include "lavc_keyframes.h", also add a c_str(). 
Originally committed to SVN as r2145.
 2008-03-25 23:42:39 +00:00
Amar Takhar
5ad19a2558 More .cstr(). 
Originally committed to SVN as r2144.
 2008-03-25 23:08:28 +00:00
Amar Takhar
f0f0d541b6 Add a .c_str(); to _filename (line 83) 
Originally committed to SVN as r2143.
 2008-03-25 23:01:29 +00:00
Karl Blomster
cd177995d2 added same flag to win64 config0.h. 
Originally committed to SVN as r2139.
 2008-03-24 12:21:44 +00:00
Karl Blomster
4e3529930d added new config.h define, WITH_STATIC_FFMPEG, to make it possible to link ffmpeg as a static library instead of dynamic. 
Originally committed to SVN as r2138.
 2008-03-24 12:19:17 +00:00
Karl Blomster
7be56fbcd4 cast some lavc context variables to int (avoids warning treated as error when compiling WITH_FFMPEG on msvc) 
Originally committed to SVN as r2137.
 2008-03-24 11:30:35 +00:00
pstatic
cbf7143b85 typo in audio_provider_pcm 
Originally committed to SVN as r2131.
 2008-03-24 02:44:45 +00:00
Niels Martin Hansen
08910b5a9d Make PCM audio provider access the file memory mapped instead of through regular file access, per bug #686. Tested to work on Windows. 
I've also added a POSIX implementation but it's untested and might not even build.
The implementation is not actually thread safe, but this shouldn't be a problem in most cases, yet. It should still be fixed at some point.

Originally committed to SVN as r2130.
 2008-03-24 00:10:09 +00:00
Amar Takhar
e4d77f6474 Completely remove support for an external libass: 
* The internal libass will always be newer than external packages.
  * aegisub requires fontconfig _and_ iconv support, some systems have
    either/or but rarely both.
  * There's zero benifit to supporting an external version.

In the future I might add some flags to allow it, if there is a compelling
reason to.

Originally committed to SVN as r2125.
 2008-03-23 22:56:21 +00:00
Karl Blomster
2c495b5d80 casting 
Originally committed to SVN as r2119.
 2008-03-23 12:36:16 +00:00
Karl Blomster
b6d8b403d6 fix catastrophic failure in last commit 
Originally committed to SVN as r2116.
 2008-03-22 22:48:59 +00:00
Karl Blomster
e61d333297 warn the user if audio skew is likely 
Originally committed to SVN as r2115.
 2008-03-22 22:45:46 +00:00
Karl Blomster
76469421e4 minor tweaks to the lavc audio provider. 
Originally committed to SVN as r2114.
 2008-03-22 22:18:43 +00:00
Amar Takhar
a86a882c0a Remove files not required by the macosx build. 
Originally committed to SVN as r2103.
 2008-03-22 08:35:30 +00:00