Commit graph

553 commits

Author SHA1 Message Date
Amar Takhar
8ba5aa27be Move stream position info into it's own struct.. Looks like a few globals can't be helped due to how the AudioPlayer class is designed. If I have to use globals I'll atleast make them easier to manage.. Updates #997.
Originally committed to SVN as r3434.
2009-08-21 21:40:18 +00:00
Amar Takhar
5ea99a65e7 Remove unused global 'stopping' and remove unused mutex code. Updates #997.
Originally committed to SVN as r3433.
2009-08-21 20:28:43 +00:00
Amar Takhar
2df6b2fd38 Remove 'playing' global in favour of an IsPlaying function that uses Pa_IsStreamActive(). Updates #997.
Originally committed to SVN as r3432.
2009-08-21 20:08:58 +00:00
Amar Takhar
f5a9af6a6c Call wxTheClipboard->UsePrimarySelection(true) when using wxClipboard, without getting into detail clipboard work very differently on X11. Without calling this copying to the clipboard won't work. I've just put it after every use of ->Open, this is safe as in every case Close() is called right after. This will fix clipboard copying on all unices.
Originally committed to SVN as r3431.
2009-08-20 02:31:33 +00:00
Amar Takhar
50d9dbd4f1 Add detach_video_menu and show_overscan_menu_checked <- this one isn't in use as you can't Check() a menu item that has a bitmap, we need to figure out an alternate solution. This probably involves flipping the bitmap to our own of a checkmark.
Originally committed to SVN as r3430.
2009-08-19 07:03:39 +00:00
Amar Takhar
2bf5f6656e Commit modified buttons from r3428.
Originally committed to SVN as r3429.
2009-08-19 06:48:50 +00:00
Amar Takhar
b2f4c07de9 PNG versions from r3426.
Originally committed to SVN as r3427.
2009-08-18 06:23:06 +00:00
Amar Takhar
58965afc9a * Delete find_replace_button and find_next_button (these were blank anyway) and replace them with find_next_menu and find_replace_menu.
* Add new buttons open_audio_menu, open_audio_from_video_menu, close_audio_menu and close_video_menu.

Originally committed to SVN as r3425.
2009-08-18 01:28:15 +00:00
Amar Takhar
5cfa19f6b9 Add png versions of the modified SVG buttons from r3423.
Originally committed to SVN as r3424.
2009-08-18 01:24:00 +00:00
Niels Martin Hansen
f3e84bea88 Some more cache management stuff for the audio rendering.
Originally committed to SVN as r3421.
2009-08-16 16:22:59 +00:00
Niels Martin Hansen
4526b0dc43 Try to get around G++'s dislike of my iterators by using an integer index instead.
Originally committed to SVN as r3419.
2009-08-16 04:31:29 +00:00
Amar Takhar
b37310e286 Add a bunch of new icons from Kaverin.
Originally committed to SVN as r3418.
2009-08-16 03:54:44 +00:00
Niels Martin Hansen
56b40bc67a Will GCC like me better if I sprinkle some 'typename' around?
Originally committed to SVN as r3417.
2009-08-16 03:50:41 +00:00
Niels Martin Hansen
c97f91c137 Fix compilation errors on GCC.
Also fix a bug in the block cache where it wasn't the sorted order of the macroblocks by access count that was used in determining which ones to kill off.

Originally committed to SVN as r3415.
2009-08-16 01:10:20 +00:00
Niels Martin Hansen
e9e3b2d107 Change AudioRenderer to use DataBlockCache.
Originally committed to SVN as r3414.
2009-08-16 00:28:26 +00:00
Niels Martin Hansen
d29d267cce Did I say we were going to use a B+ tree for caching stuff? No I didn't, I never said so!
(Revert r3411 and r3410.)

Originally committed to SVN as r3413.
2009-08-15 21:56:28 +00:00
Niels Martin Hansen
76d94ec94c Add DataBlockCache template class. It parses but I don't know if it compiles yet.
Updates #951, #965, #990.

Originally committed to SVN as r3412.
2009-08-15 21:48:58 +00:00
Amar Takhar
324094960b Add btree/*.h to _SOURCES.
Originally committed to SVN as r3411.
2009-08-15 04:21:50 +00:00
Niels Martin Hansen
60e2cf3790 Add Anton Fedoruk's B+ Tree implementation, intended to be used for for audio display caching among other things.
Originally committed to SVN as r3410.
2009-08-15 04:20:25 +00:00
Amar Takhar
3b1a722e5c Add a \n after Kaverins entry to wrap (noticed by kaverin).
Originally committed to SVN as r3409.
2009-08-14 05:18:20 +00:00
harukalover
34913135c9 Removed a condition which would make clicking on a line that was already selected never update the editbox, this was wrong since the line's text can be changed by functions outside of direct editing in the editbox (e.g. automation scripts)
Originally committed to SVN as r3408.
2009-08-14 05:08:29 +00:00
Amar Takhar
a31139a408 Reverse tooltips for the Cancel/Accept buttons in Split mode... I checked all of this carefully before I comitted, I guess I read what I wanted to see. (noticed by Kaverin)
Originally committed to SVN as r3407.
2009-08-14 04:57:32 +00:00
Amar Takhar
edc7b00b97 PNG versions of the modified buttons.
Originally committed to SVN as r3406.
2009-08-14 03:17:16 +00:00
Amar Takhar
bebc71ef53 Change how the Split/Join mode buttons work. Previously there was a weird hack used to change the text of the buttons when the various modes were used. When switching to icons this was no longer possible -- Well you could switch the bitmap dynamically but that's really gross. Instead the two pairs of buttons are put into their own BoxSizers which are Shown and Hidden when each mode is used.
Originally committed to SVN as r3404.
2009-08-14 03:11:34 +00:00
Thomas Goyne
696e76379e Make the hotkeys for the visual typesetting modes customizable. Closes #992
Originally committed to SVN as r3402.
2009-08-13 22:07:43 +00:00
Niels Martin Hansen
fd65666eb2 Forgot to change filenames in doxy comments when renaming audio_spectrum.*.
Originally committed to SVN as r3400.
2009-08-13 17:28:12 +00:00
Niels Martin Hansen
dcebd9be94 Add constructor and destructor to AudioRendererBitmapProvider base class.
GCC warned that it was missing a virtual destructor while having virtual methods.

Originally committed to SVN as r3399.
2009-08-13 16:14:41 +00:00
Niels Martin Hansen
f810fd20ce Rename audio_spectrum.* to audio_renderer_spectrum.* in preparation of converting the spectrum into a slave of AudioRenderer. See #951 and #990.
Originally committed to SVN as r3398.
2009-08-13 16:04:45 +00:00
Niels Martin Hansen
2a7e42c6a5 This should fix Mac builds failing on GL stuff.
Originally committed to SVN as r3396.
2009-08-13 00:35:45 +00:00
Niels Martin Hansen
09e27f5df3 Add two missing functions to audio_renderer.cpp to finally make it compile!
Originally committed to SVN as r3395.
2009-08-13 00:14:36 +00:00
Niels Martin Hansen
80364aaf01 Also forgot a wx include for wxMemoryDC in audio_renderer.cpp.
Originally committed to SVN as r3394.
2009-08-13 00:05:38 +00:00
Niels Martin Hansen
29f1272843 Uh oops, audio_renderer.cpp was including <set> instead of <map>...
Originally committed to SVN as r3393.
2009-08-13 00:04:16 +00:00
Niels Martin Hansen
5501c42cb0 Add (currently unused) AudioRendrer class and companions, see #951, #965 and #990.
Originally committed to SVN as r3390.
2009-08-12 23:42:53 +00:00
Niels Martin Hansen
0276b31225 Get rid of the unused and outdated changelog.txt.
Originally committed to SVN as r3389.
2009-08-11 18:21:58 +00:00
Amar Takhar
f8963ff875 Update a bunch of icons from Kaverin and add the final two karaoke buttons.
Originally committed to SVN as r3388.
2009-08-11 17:01:02 +00:00
Amar Takhar
86e14fc0cc Add an Icons by: Phlip Cash entry for Kaverin to the about dialogue.
Originally committed to SVN as r3387.
2009-08-11 07:20:36 +00:00
Amar Takhar
e046f753d9 Switch Karaoke mode button, join button and split button to new icons..
Originally committed to SVN as r3385.
2009-08-11 06:07:19 +00:00
Amar Takhar
24c25d01e3 Change the 'Commit' (text) button to button_audio_commit. (note: we really need to rename our icon reference/filenames)
Originally committed to SVN as r3384.
2009-08-11 05:50:11 +00:00
Amar Takhar
94965d1277 Add new icon: kara_timing_copier which replaces kanji_timer_button. Nothing has been changed other than the icon name. updates #870
Originally committed to SVN as r3383.
2009-08-11 05:35:25 +00:00
Amar Takhar
c945d3e8e4 Follow-up r3381 and adjust modified icons, also add new kara_* icons.
Originally committed to SVN as r3382.
2009-08-11 05:28:16 +00:00
Amar Takhar
2106a1950c Update png icons to the latest from r3379.. eventually we need to compare the uncompressed DATA entry to detect if an icon has really changed or not..
Originally committed to SVN as r3380.
2009-08-09 05:53:47 +00:00
Karl Blomster
65fb2e7efa Remove a pointless attempt to reindex a file in the ffms2 video provider. It didn't help anything, in fact it just caused crashes since the source object was free'd after the first attempt. Fixes #976.
Originally committed to SVN as r3377.
2009-08-07 20:16:13 +00:00
Karl Blomster
1a182098fc Document the Y4M video provider.
Originally committed to SVN as r3376.
2009-08-07 19:59:37 +00:00
Amar Takhar
c6c99a1fe6 Update icons, just two left find_button (binoculars) and the translation button (fish).
Originally committed to SVN as r3375.
2009-08-06 21:57:15 +00:00
Amar Takhar
27256ae44a Add libresrc.cpp, libresrc.h to CLEANFILES.
Originally committed to SVN as r3373.
2009-08-06 21:26:27 +00:00
Amar Takhar
02581bf1f1 Add a new option --enable-gcc-prec which will enable the use of gcc precompiled headers, this speeds up the build time (including one time builds) by several oders of magnitude. closes #975
Originally committed to SVN as r3369.
2009-08-06 04:35:35 +00:00
Amar Takhar
d899c816b8 Document kana_table.*
Originally committed to SVN as r3368.
2009-08-06 01:55:24 +00:00
Niels Martin Hansen
b6a63c15e6 Adjust throwing of exceptions to the new style documented in exception.h.
(Good thing nothing is catching these yet, and it's the only case of "new style" exceptions being used.)

Originally committed to SVN as r3365.
2009-08-05 20:52:44 +00:00
Niels Martin Hansen
c731a9b437 Document exception.h
Originally committed to SVN as r3364.
2009-08-05 20:51:32 +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
c5f0ee3767 Make sure ../libffms/include is included very early on so it is picked up before any version installed system-wide.
Originally committed to SVN as r3361.
2009-08-05 04:02:40 +00:00
Niels Martin Hansen
7f106eaf91 Document namespace Aegisub
Originally committed to SVN as r3360.
2009-08-05 02:17:13 +00:00
Karl Blomster
47f9492832 Change WITH_PORTAUDIO2 to WITH_PORTAUDIO; this renaming was actually done ages ago but never got changed in config/config_windows0.h because nobody builds with it on Windows.
Originally committed to SVN as r3359.
2009-08-04 21:17:33 +00:00
Niels Martin Hansen
f664a26b18 Rename Kanji Timer step 2: Rename things in docs (and include guard)
Updates #870.

Originally committed to SVN as r3358.
2009-08-04 02:00:30 +00:00
Niels Martin Hansen
96acbe33c3 Rename Kanji Timer step 1: Rename source files.
Updates #870.

Originally committed to SVN as r3357.
2009-08-04 01:53:26 +00:00
Thomas Goyne
755b40a966 Switch the safer autosaving to the standard method of writing to a different file then replacing the original.
Originally committed to SVN as r3354.
2009-08-02 20:39:36 +00:00
Thomas Goyne
cca0de98cb Make autosave create a temporary backup of the current autosave file before saving so that an error while saving is less likely to cause data loss.
Originally committed to SVN as r3353.
2009-08-02 20:32:53 +00:00
Amar Takhar
5ccf95b9df Document Hunspell.
Originally committed to SVN as r3352.
2009-08-01 04:37:29 +00:00
Amar Takhar
6bde901e5e Document about dialogue.
Originally committed to SVN as r3351.
2009-08-01 04:02:20 +00:00
Niels Martin Hansen
332168f596 Fix Doxygen for avisynth_wrap.
Originally committed to SVN as r3350.
2009-08-01 03:41:42 +00:00
Amar Takhar
0fe2c476a4 It's @ticket not @issue, use as @ticket{<number>} instead of @ticket <number>.
Originally committed to SVN as r3349.
2009-08-01 03:40:47 +00:00
Niels Martin Hansen
51288bc06d Make a typedef of a function type, hoping to fix Doxygen warnings.
Originally committed to SVN as r3348.
2009-08-01 03:27:13 +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
Niels Martin Hansen
a5a8665859 Do a bit of documenting of audio display drawing functions.
Originally committed to SVN as r3345.
2009-08-01 02:32:26 +00:00
Amar Takhar
db6e3d84c1 Fix setting the window as modified, I don't know if this will work in 10.4.. (fix from jfs)
Originally committed to SVN as r3344.
2009-08-01 02:00:30 +00:00
Niels Martin Hansen
e42d184ec4 Add Doxygen documentation to audio spectrum code
Originally committed to SVN as r3343.
2009-08-01 01:55:17 +00:00
Thomas Goyne
4eba7657a2 Fix the slider in the color picker for non-GTK platforms. wx2.9 appears to have synchronized the behavior of changing the value of a slider across all platforms to how it behaved on GTK.
Originally committed to SVN as r3341.
2009-07-31 23:42:15 +00:00
Thomas Goyne
4472dfee12 Fix an assertion failure that happened whenever an ass override tag with too few parameters was parsed.
Originally committed to SVN as r3340.
2009-07-31 23:26:13 +00:00
Amar Takhar
a91495c69d Remove wxBevelButton support as it's no loger required for 2.9.
Originally committed to SVN as r3339.
2009-07-31 20:34:23 +00:00
Thomas Goyne
79e4065579 Add default values for the optional parameters of \move, fixing an assertion failure when they are not specified.
Originally committed to SVN as r3336.
2009-07-31 16:50:48 +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
93f78921f3 Add missing @param in exception.h
Originally committed to SVN as r3330.
2009-07-30 04:29:12 +00:00
Amar Takhar
4e37bdea68 Cleanup doxygen markup.
Originally committed to SVN as r3329.
2009-07-30 04:27:48 +00:00
Amar Takhar
583cf55afb Add Doxygen skel info for video_provider_yuv4mpeg.h which was having errors in the first round.
Originally committed to SVN as r3328.
2009-07-30 04:25:52 +00:00
Amar Takhar
d82d02010b Add Doxygen skeleton info for general include files.
Originally committed to SVN as r3327.
2009-07-30 04:24:23 +00:00
Amar Takhar
2fd9b9d7e3 Fix a whole bunch of Doxygen warnings.
Originally committed to SVN as r3325.
2009-07-30 03:36:53 +00:00
Amar Takhar
cd8bb7c241 Document PortAudio player, this is broken in doxygen at the moment not sure why..
Originally committed to SVN as r3323.
2009-07-30 02:51:42 +00:00
Amar Takhar
cc08d39f2e Dcoument AegisubFileDropTarget.
Originally committed to SVN as r3321.
2009-07-30 02:09:21 +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
d6fbe6fc8e Add svn:keywords for files modified in r3310.
Originally committed to SVN as r3311.
2009-07-29 05:43:58 +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
Niels Martin Hansen
3097ca162d Handle ASS files with missing [Script Info] header better, updates #440.
This should get some additional regression testing before the bug is closed and the fix backported to 2.1.8.

Originally committed to SVN as r3308.
2009-07-29 01:59:12 +00:00
Niels Martin Hansen
174c17309b Remove progress dialogue and threaded call from Auto4 Lua export filter config dialogue production call. This somewhat breaks an undocumented part of the API but I don't think anything relies on this.
Should close #927.

Originally committed to SVN as r3307.
2009-07-28 15:39:52 +00:00
Niels Martin Hansen
049baecfc4 Fill in missing docs from r3304.
Originally committed to SVN as r3306.
2009-07-28 13:34:31 +00:00
Amar Takhar
a1d04599e2 Add @ingroup libosxutil.
Originally committed to SVN as r3305.
2009-07-28 06:12:25 +00:00
Amar Takhar
373c0057b2 Document using the Doxygen format.
Originally committed to SVN as r3304.
2009-07-28 06:07:44 +00:00
Niels Martin Hansen
7f9099da90 Apparently dummy video needs "the VFR hack" or it's broken.
Originally committed to SVN as r3302.
2009-07-28 00:02:39 +00:00
Thomas Goyne
7aad443f48 Delete some code in SubsEditBox::SetOverride that did nothing.
Originally committed to SVN as r3301.
2009-07-27 23:55:17 +00:00
Niels Martin Hansen
28e974e665 Fix crash (div by 0) introduced in r3295, updates #953.
(Blind fix, doesn't happen on Windows.)

Originally committed to SVN as r3297.
2009-07-27 21:11:39 +00:00
Niels Martin Hansen
675afab201 Hopefully fix build error on OS X, WindowRef and SetWindowModified() being undeclared in frame_main.
Originally committed to SVN as r3296.
2009-07-27 01:07:54 +00:00
Niels Martin Hansen
f2e8333aea Fix #953, somewhat hackish: The grid never sized down because the scroll bar was a child window of it, and when a window has child windows, the bottom and rightmost coordinates of those together determine the minimum size of the containing window. This behaviour changes if those child windows are managed by a sizer. By putting the scroll bar into a sizer the problem goes away.
I think a better solution would be to change to use wxWindow::SetScrollbar() but that's a larger operation.

Originally committed to SVN as r3295.
2009-07-26 23:24:21 +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
Niels Martin Hansen
696ae74f8a Add some const-ness to the kana table, should fix compiler warnings on GCC.
Originally committed to SVN as r3293.
2009-07-26 17:25:04 +00:00
Thomas Goyne
d401e67402 Switch the main window's icon back to the .ico version on windows as it was rejecting the png one.
Originally committed to SVN as r3285.
2009-07-25 20:32:58 +00:00
Amar Takhar
0f841aae1a Convert the icon to png from xpm, I'm not sure how Windows will handle the alpha on this image.. someone on Windows will need to check.
Originally committed to SVN as r3284.
2009-07-25 20:07:07 +00:00
Amar Takhar
37010aee03 I thought res.rc was already updated, I should have looked.. this fixes breakage in r3281.
Originally committed to SVN as r3283.
2009-07-25 19:46:10 +00:00
Niels Martin Hansen
f51e7b1483 Let's make setup.cpp fail on wx 2.8
Originally committed to SVN as r3282.
2009-07-25 19:39:34 +00:00
Amar Takhar
6da57c3c8d We don't need the XPM icons anymore, and eyedropper.cur/icon.ico have moved to windows/
Originally committed to SVN as r3281.
2009-07-25 19:29:08 +00:00
harukalover
072520bf5f Removed most of the wxWidgets 2.8 compatibility code
Originally committed to SVN as r3280.
2009-07-25 18:45:30 +00:00
Thomas Goyne
01505e3d37 Mostly fix unix build issues related to the new image embedding.
Originally committed to SVN as r3276.
2009-07-25 18:08:17 +00:00
Thomas Goyne
e6d6a056c9 Change resources filename back to libresrc.cpp/h.
Originally committed to SVN as r3272.
2009-07-25 16:15:13 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Karl Blomster
491fa10ff1 Fix a regression introduced by Plorkyeran's iconv patch that caused the text file reader to throw an exception when trying to read an empty file.
Originally committed to SVN as r3146.
2009-07-16 15:10:40 +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
5cb4d1cae3 Revert r3137 for video_provider_ffmpegsource.cpp; the patch fixed an issue that had already been fixed (by using UTF8 instead of the local codepage).
Originally committed to SVN as r3144.
2009-07-15 04:02:15 +00:00
Niels Martin Hansen
ece75e0652 Make version checker include current version (source SVN revision) in request for latest.txt, for statistics purposes.
Originally committed to SVN as r3140.
2009-07-14 23:23:39 +00:00
Karl Blomster
b2c1eced55 Make the name of the limit to visible lines export filter translatable. Fixes #789.
Originally committed to SVN as r3139.
2009-07-14 22:29:38 +00:00
Thomas Goyne
0ea2c53c1a Replaced most wx-based charset conversions with a custom iconv-based conversion. Closes #639, #666, #837, #849 and #877.
Originally committed to SVN as r3137.
2009-07-14 21:28:49 +00:00
Amar Takhar
dac40729e0 s/greg_/Grigori Goronzy/ for the libass credit updates #894.
Originally committed to SVN as r3135.
2009-07-14 19:45:43 +00:00
Amar Takhar
49a116804d Change version in version.cpp and configure.in to 2.2.0, the string freeze is officially over and all the commits we've been holding back can now go in!
Originally committed to SVN as r3134.
2009-07-14 18:15:11 +00:00
Niels Martin Hansen
26c9dd2ce6 More cleanup of local config:
* Remove option from Options dialogue, it's an install-time thing really
 * Don't try to do file associations at startup if we're portable
 * General clean up of config handling code; properly make ?user point to ?data and then everything magically follows, makes a lot of handling cleaner

Originally committed to SVN as r3131.
2009-07-14 04:51:35 +00:00
Niels Martin Hansen
f1c7ed639d Properly fix "local config" option, previously it only made config.dat local and kept everything else in %APPDATA% still. Now fixed, along with a load of other problematic uses of relative paths. Still a lot more to go.
This also makes a bit of sense of the default options for various paths that previously were implicitly relative to ?user or ?data but never explicitly specified in options.

Originally committed to SVN as r3130.
2009-07-14 03:02:17 +00:00
Karl Blomster
2f65a5bb68 Remove the dangerous CopyFile function that on Unix attempted to create hard links of files instead of copying them. Replace it with wxCopyFile instead. Patch by jfs. Fixes #912.
Originally committed to SVN as r3129.
2009-07-14 02:20:40 +00:00
Niels Martin Hansen
68481215c9 Apply patch to fix #910.
Originally committed to SVN as r3128.
2009-07-14 02:00:56 +00:00
Amar Takhar
75bfada57e Actually fix libosxutil includes, as many times as I'd like to belive using 'diff' to transfer from a working copy to a non-working copy is the safest I always endup convincing myself that it's impossible to screw-up a _two_ line patch.
Originally committed to SVN as r3121.
2009-07-13 22:38:43 +00:00
Amar Takhar
4599eec308 Wrap libosxutils headers with "extern C"
Originally committed to SVN as r3118.
2009-07-13 22:32:11 +00:00
Amar Takhar
5ad6e777d3 Build changes for the new ffms, TheFluff will be comitting the aegisub changes shortly.
Originally committed to SVN as r3117.
2009-07-13 22:30:49 +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
Niels Martin Hansen
ac64269ade Preparing for 2.1.7 release, new URLs for latest.txt.
Originally committed to SVN as r3110.
2009-07-13 18:31:43 +00:00
Amar Takhar
24da41faaf * BUILD_DARWIN was a define used for libass only, change it to __APPLE__ (sigh)
* char config_path -> const char *config_path for non-MAC builds. not sure how the first version got in.

Originally committed to SVN as r3107.
2009-07-12 20:10:25 +00:00