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

1781 commits

Author SHA1 Message Date
Amar Takhar
fb3431df66 Commit changes to support importing bitmaps as character strings, this is still broken however the final fix should be quite simple. 
Originally committed to SVN as r3270.
 2009-07-25 09:35:44 +00:00
Amar Takhar
ffe628f29a Move tellg() usage to the start of the block rather than at the end, otherwise it would always return -1. This should be harmless for windows. 
Originally committed to SVN as r3269.
 2009-07-25 08:32:21 +00:00
Amar Takhar
2522102465 Change .wc_str() to .char_str() to fix unix build breakage, should be fine on windows.. 
Originally committed to SVN as r3268.
 2009-07-25 08:01:30 +00:00
Amar Takhar
a0099e7f74 s/scripts/tools/ after the rename 
Originally committed to SVN as r3267.
 2009-07-25 05:23:04 +00:00
Thomas Goyne
c641c6e656 Switch all icons in Aegisub to use the new png versions, using a new small tool to store the pngs as byte arrays in a cpp file. 
Originally committed to SVN as r3265.
 2009-07-25 04:49:59 +00:00
Amar Takhar
c87e0f2c7b Add icon.ico and eyedropper.cur to windows/ and splash.png to misc/. 
Originally committed to SVN as r3264.
 2009-07-25 03:32:06 +00:00
Amar Takhar
972c5e7f12 Add in missing buttons, which are very ugly scales of the original .bmp icons, these are for interm use until we have svg versions. 
Originally committed to SVN as r3263.
 2009-07-25 03:25:11 +00:00
Amar Takhar
586f3f8d2b Commit png versions of the (new) .svg icons Kaverin made, these have been made as original work or from the original .bmp icons. 
Originally committed to SVN as r3262.
 2009-07-25 03:23:35 +00:00
Amar Takhar
d51396738b Revert part of r3260: SIGH, why can't svn let you ctrl-c out of a commit further down in the process? You can only do it if you catch it early, though it's also my fault for not paying attention that I had local changes. 
Originally committed to SVN as r3261.
 2009-07-25 02:34:33 +00:00
Amar Takhar
4a757421d9 Rename scripts/ to tools/ as it makes more sense, initially the directory only contained scripts however with the addition of our 3rd tool it makes sense to just rename the entire direectory. Keeping the old scripts/ dir around was just extra clutter and would probably cause confusion as to which place a new script/tool should go. 
Originally committed to SVN as r3260.
 2009-07-25 02:29:04 +00:00
Amar Takhar
75a5c70297 Remove some old scripts from Makefile.am that were used for the bmp->xpm conversion. 
Originally committed to SVN as r3259.
 2009-07-25 02:11:27 +00:00
Karl Blomster
1e4119f337 Add quicktime audio provider to VS2008 project and to Makefile.am. 
Originally committed to SVN as r3255.
 2009-07-24 06:06:56 +00:00
Karl Blomster
bec8951534 Implement a basic QuickTime audio provider. Currently a bit limited in functionality (it will convert everything to 16-bit mono), but seems to work fine with the one .mov test file I have. Also does a lot of ugly downcasting, I'll try to fix that later. 
Originally committed to SVN as r3254.
 2009-07-24 06:04:19 +00:00
Amar Takhar
8cb1e62831 Remove libresrc.h from config.h as it's now included per-file. 
Originally committed to SVN as r3253.
 2009-07-24 05:47:03 +00:00
Thomas Goyne
e21337f34f Made it so that the font collector does not crash Aegisub when it is built with both no freetype and no fontconfig. 
Originally committed to SVN as r3252.
 2009-07-24 02:30:11 +00:00
Thomas Goyne
83bb2ecedd Fix the number of rows in another sizer. 
Originally committed to SVN as r3251.
 2009-07-24 02:18:11 +00:00
Thomas Goyne
766ae98a76 Add wxOK to some message boxes that specified flags without including either wxOK or wxYESNO. 
Originally committed to SVN as r3250.
 2009-07-24 02:10:41 +00:00
Thomas Goyne
f81b147031 Remove a double addition of a single button to the kanji timer dialog. 
Originally committed to SVN as r3249.
 2009-07-24 02:06:15 +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
Thomas Goyne
af6492d867 Fix the number of rows in several wxFlexGridSizers in the options dialog. 
Originally committed to SVN as r3247.
 2009-07-24 00:58:17 +00:00
Thomas Goyne
3eacb9ba42 Remove an unnecessary StretchSpacer from the color picker dialog that caused problems with wx 2.9. 
Originally committed to SVN as r3246.
 2009-07-24 00:50:31 +00:00
Thomas Goyne
b7412a08c6 Make the windows buildbot not try to copy the now non-existent auto3 dll. 
Originally committed to SVN as r3245.
 2009-07-24 00:38:48 +00:00
Thomas Goyne
fcbc9fcdc0 Move the libresrc include to the individual files that need it. 
Originally committed to SVN as r3244.
 2009-07-24 00:08:25 +00:00
Karl Blomster
7149e01888 Move more stuff to the common QT provider class and generalize initializing/de-initializing QuickTime. 
Originally committed to SVN as r3243.
 2009-07-23 23:57:12 +00:00
Thomas Goyne
87e96be4b5 Make the windows build system work with the XMP buttons. 
Originally committed to SVN as r3242.
 2009-07-23 23:54:06 +00:00
Amar Takhar
98dad055ff Switch from converting .bmp->XPM dynamically during the autogen step into building libresrc directly from the XPM buttons now that the .bmp files are gone. 
Originally committed to SVN as r3241.
 2009-07-23 23:51:13 +00:00
Amar Takhar
356ea76703 Commit libres files, these used to be automatically generated using some AWK scripts I wrote. 
Originally committed to SVN as r3240.
 2009-07-23 23:46:32 +00:00
Amar Takhar
0d40a537f4 Add XPM versions of the .bmp buttons. 
Originally committed to SVN as r3239.
 2009-07-23 23:44:27 +00:00
Amar Takhar
54c535789a Move bmp buttons from trunk/aegisub/src/bitmaps -> trunk/docs/art-sources/buttons now that we're using XPM buttons. 
Originally committed to SVN as r3238.
 2009-07-23 23:43:49 +00:00
Amar Takhar
b62f52d8f8 Swap wxBITMAP(.*) with wxBitmap(.*_xpm) now that we're switching to xpm buttons on _all_ platforms, this makes things much easier. 
Originally committed to SVN as r3237.
 2009-07-23 23:38:04 +00:00
Amar Takhar
85330c01ae Remove PERL,Ruby from the scripting engine status at the bottom of configure output. 
Originally committed to SVN as r3235.
 2009-07-23 22:40:02 +00:00
Thomas Goyne
9fef5b0606 Kill aegisub-auto3.dll. 
Originally committed to SVN as r3234.
 2009-07-23 22:16:55 +00:00
Thomas Goyne
4f5f165d30 Removed the rest of the uses of delayload_libauto3.vsprops from aegisub_vs2008.vcproj. 
Originally committed to SVN as r3233.
 2009-07-23 21:26:54 +00:00
harukalover
6d82665116 Removed FloatSpinCtrl since it was unused and can be replaced by wxSpinCtrlDouble now that we have switched to wx2.9 
Originally committed to SVN as r3232.
 2009-07-23 21:02:39 +00:00
harukalover
581b515f22 Removed delayload_libauto3.vsprops now that auto3 is gone 
Originally committed to SVN as r3231.
 2009-07-23 20:55:46 +00:00
Amar Takhar
9cd0720036 Disable osx_bevelButton until we see how 2.9 looks on 10.4 (carbon) and 10.5 (coca). 
Originally committed to SVN as r3228.
 2009-07-23 20:22:07 +00:00
Amar Takhar
11ad86631a Switch configure.in to use the new wx2.9 m4 macros and change autogen.sh to look for wxwin29.mp4 versus wxwin28.mp4. This forces the requirement of wx2.9 now. 
Originally committed to SVN as r3227.
 2009-07-23 20:20:03 +00:00
Karl Blomster
8ef5d3869a Actually add the new common class files (derp) and add them to the makefile/msvc project. 
Originally committed to SVN as r3226.
 2009-07-23 20:19:42 +00:00
Karl Blomster
93477952c0 Factor a few things out of the QT video provider into a common QT class in preparation for eventually adding an audio provider sometime down the line. 
Originally committed to SVN as r3225.
 2009-07-23 20:17:09 +00:00
Karl Blomster
ab1993467a Remove a bunch of no longer needed (since we removed Aegisub::string) string conversions via c_str()/wc_str(), and replace mb_str(wxConvUTF8) with utf8_str() where appropriate. 
Originally committed to SVN as r3224.
 2009-07-23 19:57:57 +00:00
Amar Takhar
aa86cdb062 Turn a few string joins into wxString::Format, also change a printf to wxLogDebug as it's unnecessary spam to the user, this fixes a weird error wx2.9 was having. 
Originally committed to SVN as r3222.
 2009-07-23 17:02:19 +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
Amar Takhar
a0370f9004 Remove Aegisub::String class as it's causing problems in wx2.9. The original plan was to have it so external modules wouldn't have to depend on wx. We'll think of a different solution when the time comes. closes #940 
Originally committed to SVN as r3220.
 2009-07-23 15:16:53 +00:00
Amar Takhar
e496c0487d Remove a couple of auto3 remnants from Makefile.am. 
Originally committed to SVN as r3219.
 2009-07-23 15:14:21 +00:00
Niels Martin Hansen
312aa52096 Make spectrum mode the default for the audio display, closes #943. 
Originally committed to SVN as r3218.
 2009-07-23 13:57:40 +00:00
Amar Takhar
cd7e414b08 It looks like windows needs this change as well. 
Originally committed to SVN as r3216.
 2009-07-23 07:09:57 +00:00
Amar Takhar
d14aa9d8f0 typedef String to wxString until we decide upon the removal of Aegisub::String. (i hope so!), this fixes wx2.8 and wx2.9 when using wc_str(). 
Originally committed to SVN as r3215.
 2009-07-23 06:00:23 +00:00
Amar Takhar
c170f7f096 c_str() -> wc_str() in preperation for wx2.9, these changes are required for Unix, should be harmless on Windows. 
Originally committed to SVN as r3214.
 2009-07-23 05:32:13 +00:00
Amar Takhar
b127105f42 Remove extra FFmpegSourceProvider:: qualifier. 
Originally committed to SVN as r3212.
 2009-07-23 03:16:57 +00:00
Karl Blomster
7157d50e73 Re-fix the VFR fix in r3084 by restoring the old behavior (which was correct for the only existing providers at the time it was implemented, I think) under a special condition that only triggers for the AVS provider. This does not really actually fix any bugs; the new behavior wasn't any better (in fact it was probably incorrect in some cases) but at least this way doesn't have any of the regressions the new way might have introduced. 
Originally committed to SVN as r3211.
 2009-07-23 02:06:47 +00:00
Niels Martin Hansen
0475b95e60 Further removal of traces of Auto4 Perl and Ruby. (Is this some Pokemon game?) 
Updates #930.

Originally committed to SVN as r3210.
 2009-07-23 01:57:53 +00:00
Karl Blomster
bec9378182 Remove video_provider_dshow.cpp from EXTRA_SOURCES in Makefile.am. Updates #930. 
Originally committed to SVN as r3209.
 2009-07-23 01:46:11 +00:00
Amar Takhar
c6145f0b63 I don't know why there were .pm files under data_general.. updates #840 and #938. 
Originally committed to SVN as r3208.
 2009-07-23 01:45:11 +00:00
Niels Martin Hansen
f35b48470a Seems Fluff forgot to remove some files from MSVC project when removing DShow video provider. Updates #930. 
Originally committed to SVN as r3207.
 2009-07-23 01:43:58 +00:00
Niels Martin Hansen
07900b05f0 Oops, build-breaker = me. Forgot to save MSVC project before committing so the removed property sheet was still referenced. Updates #938. 
Originally committed to SVN as r3206.
 2009-07-23 01:41:48 +00:00
Niels Martin Hansen
31657f94da The removal of Auto4 Ruby and Auto4 Perl code. Updates #665 and #938. 
Originally committed to SVN as r3205.
 2009-07-23 01:39:57 +00:00
Amar Takhar
af5df13f00 Remove Auto4 Ruby from the (unix) build system, updates #665 and #938. 
Originally committed to SVN as r3204.
 2009-07-23 01:23:35 +00:00
Amar Takhar
3403a5faea Remove Auto4 PERL from the build system, updates #840 and #938. 
Originally committed to SVN as r3203.
 2009-07-23 01:18:51 +00:00
Amar Takhar
d8c7515975 Remove a few auto3 files that wern't associated with auto3 in the Makefile. 
Originally committed to SVN as r3202.
 2009-07-23 01:11:27 +00:00
Niels Martin Hansen
3b917f61bf Fix a warning on GCC about initialisation order in Aegisub::Exception class. 
Originally committed to SVN as r3201.
 2009-07-23 01:11:22 +00:00
Niels Martin Hansen
c52d45dd95 Missed a bunch of things removing Auto3... 
Originally committed to SVN as r3200.
 2009-07-23 00:49:54 +00:00
Amar Takhar
dbf0f48713 Nuke auto3 from the Unix/OSX build system. 
Originally committed to SVN as r3199.
 2009-07-23 00:27:57 +00:00
Niels Martin Hansen
2fef9e3111 Remove libauto3 that somehow escaped before. 
Originally committed to SVN as r3198.
 2009-07-23 00:22:57 +00:00
Niels Martin Hansen
98d909b361 Remove Auto3 from Windows buildbot solution file, should unbreak that. 
Originally committed to SVN as r3197.
 2009-07-23 00:22:20 +00:00
Niels Martin Hansen
be26ba4652 Surgically remove Automation 3. 
Going to break UNIX build and Windows buildbot for now.

Originally committed to SVN as r3196.
 2009-07-23 00:19:36 +00:00
Karl Blomster
352df194aa Remove the DirectShow VideoProvider. Fixes #930. 
Originally committed to SVN as r3195.
 2009-07-23 00:12:22 +00:00
Niels Martin Hansen
5e902e2ef1 Remove threaded-ness of Auto 4 Lua macro validation calls, updates #927. 
Originally committed to SVN as r3194.
 2009-07-22 23:07:46 +00:00
Niels Martin Hansen
520239fc1b Re-do "split by karaoke" code using the common ass_karaoke code and adding a little more sanity checking, fixes #929. 
Originally committed to SVN as r3192.
 2009-07-22 22:30:57 +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
Niels Martin Hansen
ff8c8e1817 Add exception.h declaring some base exception classes. For the sake of experimenting and showing the concept, change one (probably never thrown) exception to use the new style exceptions. 
No new source files to compile, just a new header.

Originally committed to SVN as r3190.
 2009-07-22 00:10:36 +00:00
Karl Blomster
8d5bae9558 Forgot to call Close() in the QT video provider's destructor. 
Originally committed to SVN as r3189.
 2009-07-21 21:04:38 +00:00
Karl Blomster
38c5f8200a Removed FFMS2 usage from the Avisynth video provider. If you want FFMS2, use the FFMS2 provider. 
Originally committed to SVN as r3188.
 2009-07-21 20:36:27 +00:00
Karl Blomster
ce2a549517 Implemented a basic QuickTime video provider. Works in my simple tests on Windows, but I have no idea if it even compiles on Mac. 
I leave it up to verm to add detection for it to configure; it's disabled by default (#ifdef'd out unless you #define WITH_QUICKTIME).

Originally committed to SVN as r3187.
 2009-07-21 20:24:25 +00:00
Karl Blomster
d1762c5270 The Great Colorspace Reworking of '09, part 2 of ???: change all video providers to always output RGB32, and remove the formatMask parameter of GetFrame(). This may break the dshow video provider but I have no way of testing it and AFAIK nobody else does either. If someone actually uses it, they can fix it themselves. Updates #926. 
Originally committed to SVN as r3185.
 2009-07-20 03:50:25 +00:00
Karl Blomster
eae6fea9d9 The Great Colorspace Reworking of '09, part 1 of ???: remove all traces of the YV12->RGB32 OpenGL shader program, as it was very broken and nobody ever used it. Updates #926. 
Originally committed to SVN as r3180.
 2009-07-20 01:32:01 +00:00
Karl Blomster
17abf6965e Remove some useless commented-out code and an unused variable in video_context.cpp; neither have been used since Moses crossed the Red Sea. 
Originally committed to SVN as r3179.
 2009-07-20 00:45:11 +00:00
Karl Blomster
9ff3762eaf Removed the extremely deprecated fps parameter of the video provider constructors, since it hasn't been used by anything for years and was of questionable utility when it actually was used in the Elder Days. 
Originally committed to SVN as r3178.
 2009-07-20 00:39:38 +00:00
Karl Blomster
9e150d282d Cosmetics in the y4m video provider 
Originally committed to SVN as r3177.
 2009-07-19 22:51:19 +00:00
Amar Takhar
c329c4e047 Update to 9ad13b from the libass git repo. (http://greg.geekmind.org/viewgit/) This change also includes the ability to split off fontconfig cache updating into it's own step so dialogues can be used to warn the user about the font cache being updated (it can take several mins on slow machines with lots of fonts). Updates #841 
Originally committed to SVN as r3176.
 2009-07-19 19:33:29 +00:00
Amar Takhar
ee537d06f6 Add missing <wx/filename.h> and <wx/log.h> headers. 
Originally committed to SVN as r3175.
 2009-07-19 18:50:27 +00:00
Amar Takhar
2ef6260938 Move +AM_PROG_CC_C_O after AC_PROG_CC to silence automake 1.10 
Originally committed to SVN as r3169.
 2009-07-19 18:33:08 +00:00
Karl Blomster
2b2a7f4212 Implement a YUV4MPEG video provider. (YUV4MPEG is an uncompressed video format originally created for use by mjpegtools but is also commonly used by a lot of Unix video software; see http://wiki.multimedia.cx/index.php?title=YUV4MPEG2 or http://manpages.ubuntu.com/manpages/karmic/en/man5/yuv4mpeg.5.html (man 5 yuv4mpeg, if you have mjpegtools installed) for a description of the format.) 
Currently lacks a few features (no RFF flag parsing is done, interlacing is not supported and the colorspace conversion to RGB32 could stand considerable improvement) but at least now Aegisub is capable of reading video without FFMS2 or Avisynth. Updates #920.

Originally committed to SVN as r3168.
 2009-07-19 04:13:46 +00:00
Karl Blomster
ff0787d29c Updated German translation (fixes some typos etc) by Sebastian Billau (sebastian u billau a web d de). This translation update should be backported into 2.1.8. 
Originally committed to SVN as r3165.
 2009-07-18 21:00:57 +00:00
Karl Blomster
c6a5ff07d7 Fix a very embarrassing bug (I mixed up the track masks in r3155). 
Originally committed to SVN as r3164.
 2009-07-18 20:03:32 +00:00
Thomas Goyne
c02f953ee0 Made the style sorting code only append each style once even when multiple styles have the same name. Closes #922. 
Originally committed to SVN as r3163.
 2009-07-18 04:37:43 +00:00
Thomas Goyne
0fa0d9d17e Add some parentheses for clarity. 
Originally committed to SVN as r3162.
 2009-07-18 03:58:22 +00:00
Thomas Goyne
6608ff47b5 Made the check for duplicate style names when creating or editing styles case insensitive. Closes $777. 
Originally committed to SVN as r3161.
 2009-07-18 03:45:16 +00:00
Thomas Goyne
a7d0b591f8 Rewrote code for copying styles to and from storages, making it correctly replace styles of the same name that already exist in the target. Updates #922. 
Originally committed to SVN as r3160.
 2009-07-18 02:52:46 +00:00
Thomas Goyne
c2087304fc A few minor cleanups to the new charset conversion code. 
Originally committed to SVN as r3159.
 2009-07-18 00:58:13 +00:00
Amar Takhar
779dcadc69 Add missing fixes for libauto3 to Makefile.am and commit the actual changes to libauto3/ 
Originally committed to SVN as r3158.
 2009-07-17 20:58:45 +00:00
Amar Takhar
e2e859b8f4 Exit with the previous commands exit status incase it failes: In this case copying the aegisub binary into the bundle. 
Originally committed to SVN as r3157.
 2009-07-17 19:52:08 +00:00
Amar Takhar
51c7ead1b8 s/2_1/2_2/ in Makefile.am This is required for two reasons: 
* Aegisub is monolithic
 * Automakes idea of sending flags to specific files is in creading 17,000 different libraries (which beacuse of point #1.)

Originally committed to SVN as r3156.
 2009-07-17 19:50: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
Amar Takhar
8af125b88c Remove FFMPEG files from _SOURCES -- these shouldn't have been here in the first place. Updates #921. 
Originally committed to SVN as r3154.
 2009-07-16 20:03:47 +00:00
Karl Blomster
62b036ac35 Fix accidental inclusion of test code in last commit. 
Originally committed to SVN as r3153.
 2009-07-16 19:25:43 +00:00
Karl Blomster
8087622edd Fix an ancient bug in the ffms2 video provider that caused access violations when trying to output YV12 images. Nobody discovered this before because nobody tried to use YV12. 
Originally committed to SVN as r3152.
 2009-07-16 19:20:14 +00:00
Amar Takhar
fb8196dcf8 Chase r3148 and r3149 and remove the FFMPEG video provider from the unix build system. Updates #921. 
Originally committed to SVN as r3150.
 2009-07-16 19:16:31 +00:00
Karl Blomster
cdc69b847f Remove the deprecated ffmpeg providers from the MSVC2008 project file. 
Originally committed to SVN as r3149.
 2009-07-16 19:11:00 +00:00
Karl Blomster
dfea9f9713 Remove the deprecated ffmpeg audio/video providers. They have not yet been removed from any of the build systems; verm will remove them from the Unix one and I will remove them from the MSVC project file shortly. 
Originally committed to SVN as r3148.
 2009-07-16 19:08:40 +00:00
Karl Blomster
e589bceaa6 The caching video provider should not force RGB32. Nobody really cared about this because Aegisub always uses RGB32 unless you flip secret switches and whatnot, but it's not right and other colorspaces may be used in the future. 
Originally committed to SVN as r3147.
 2009-07-16 18:50:16 +00:00