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

1994 commits

Author SHA1 Message Date
Amar Takhar
8eda8f2a9c Add <wx/arrstr.h> which was accidentally left out when moving the patch from one machine to the other in r3518. 
Originally committed to SVN as r3524.
 2009-09-11 02:30:10 +00:00
Amar Takhar
e4271d6aac Add missing <fstream> header, this should fix compilation on unix/osx. 
Originally committed to SVN as r3521.
 2009-09-11 01:07:38 +00:00
Grigori Goronzy
b017d60e39 Forward declaration for AutoloadScriptManager too 
Seems to work without it for others, but I have no idea why. This
shouldn't harm in this case still.

Originally committed to SVN as r3520.
 2009-09-10 23:28:15 +00:00
Niels Martin Hansen
6cc37d3f0b A bit more cleaning of precompiled headers for Windows builds. Comment on why things are done as they are. Also move a few headers only used in single files out of the precompiled header and into the places they're actually used. 
Originally committed to SVN as r3519.
 2009-09-10 23:08:38 +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
Niels Martin Hansen
1d80d6514b Juggle include order in agi_pre.h around a bit to make things work properly on Windows. 
Originally committed to SVN as r3517.
 2009-09-10 14:39:39 +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
79397825cf Add missing wx/log.h, sort headers. 
Originally committed to SVN as r3514.
 2009-09-10 10:51:49 +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
Amar Takhar
84996c927f Add a whole slew of missing includes, prior to r3509 config_unix.h used to include stdwx.h, now that I'm fixing the headers I removed it which caused issues when not using precompiled headers. 
Originally committed to SVN as r3512.
 2009-09-10 05:25:25 +00:00
Amar Takhar
6a7e4769e3 Add several dozen more headers to agi_pre.h 
Originally committed to SVN as r3510.
 2009-09-10 04:29:04 +00:00
Amar Takhar
05ae13a8ab * Rename stdwx.h to agi_pre.h as it doesn't include wx headers only, it's confusing. 
* Rename include guard to AGI_PRE.

Originally committed to SVN as r3509.
 2009-09-10 04:14:28 +00:00
Thomas Goyne
132d8ba3ac Move #include "config.h" to before #define WX_PRE so that it does gets included at some point. 
Originally committed to SVN as r3508.
 2009-09-10 03:14:09 +00:00
Thomas Goyne
e0cc5fc038 Wrap wx includes with _CRT_SECURE_NO_WARNINGS to make msvc stop hurfing and durfing. 
Originally committed to SVN as r3507.
 2009-09-10 02:52:34 +00:00
Amar Takhar
bdbb8cc4ce Wrap config.h with WX_PRE so it doesn't get included twice. stdwx.h requires it to be included. 
Originally committed to SVN as r3506.
 2009-09-10 02:42:06 +00:00
Amar Takhar
3c1b52eb69 Add 79 missing wx includes to stdwx.h, the build is much faster on unix, should be the same for windows. 
Originally committed to SVN as r3505.
 2009-09-10 02:32:55 +00:00
Amar Takhar
deeec2de18 Re-organise stdwx.h and sort alphabetically. 
Originally committed to SVN as r3504.
 2009-09-10 02:27:25 +00:00
Amar Takhar
925fa88c0c * Remove #pragma once. 
* Sort wx headers and wrap with #ifndef WX_PRE.
 * Add missing heade rto stdwx.h.
M    src/ass_attachment.h
M    src/subs_grid.cpp
M    src/ass_dialogue.cpp
M    src/ass_attachment.cpp
M    src/aegisub_endian.h
M    src/audio_display.cpp
M    src/audio_karaoke.cpp
M    src/dialog_kara_timing_copy.cpp
M    src/ass_dialogue.h
M    src/text_file_writer.cpp
M    src/stdwx.h

Originally committed to SVN as r3503.
 2009-09-10 02:23:43 +00:00
Amar Takhar
d519f4589d * Remove main.h from files that don't require it. 
* Remove include guard in main.h as it's no longer required.
 * Sort wx headers and wrap with #ifndef WX_PRE.
 * Add #define WX_PRE to stdwx.h.

Originally committed to SVN as r3502.
 2009-09-10 02:07:55 +00:00
Thomas Goyne
1a4e7375fd Add some documentation to VideoDisplay and clean up the includes a bit. 
Originally committed to SVN as r3501.
 2009-09-10 01:41:34 +00:00
Grigori Goronzy
a4f844c048 Fix another typo in the German translation, patch by basti2k. 
Originally committed to SVN as r3500.
 2009-09-09 12:25:03 +00:00
Amar Takhar
0992a68488 Rewrite how wxStackWalker works: 
* Change from fstream to wxFile.
 * Create both text-based and xml based reports (for the reporter)

Originally committed to SVN as r3499.
 2009-09-09 07:04:10 +00:00
Grigori Goronzy
5ab1eab906 OSS player: handle changing end position correctly 
If the slider is moved to the playbar while the player is running,
the playback needs to be stopped.  Handle this situation properly.

Additionally, select a low-latency buffer policy if possible (OSS4
only).  This will make it possible to move the slide near the playbar
without stopping playback (the current writing position is always in
advance of the playback position by the buffer size!)

Originally committed to SVN as r3498.
 2009-09-09 03:24:34 +00:00
Grigori Goronzy
9d0daf6821 Add OSS audio player 
Tested on OSS4 (4front), FreeBSD 7.2 OSS and with ALSA's OSS emulation.
Bear with me, this is both my first serious C++ and OSS code.

Originally committed to SVN as r3497.
 2009-09-08 22:06:07 +00:00
Amar Takhar
b258daa120 Add the new icons + new source paths to EXTRA_DIST, it was still set to the XPMs. 
Originally committed to SVN as r3496.
 2009-09-06 02:39:32 +00:00
Amar Takhar
a5730828d3 Remove __APPLE__ around SetBitmap() in AppendBitmapMenuItem, this gives us pretty icons in our menus on osx. 
Originally committed to SVN as r3495.
 2009-09-06 00:41:38 +00:00
Amar Takhar
ba87160fdc Linux needs a specific wx-config path too for 2.9, this should fix ubuntu, debian is still broken. 
Originally committed to SVN as r3494.
 2009-09-06 00:01:06 +00:00
Amar Takhar
ea5bdad036 Set path to correct wx-config, this shouild fix disting on freebsd. 
Originally committed to SVN as r3493.
 2009-09-05 23:58:25 +00:00
Amar Takhar
6c08c50d92 Revert 3489 the issue is more complex than I originally thought. Updates #1009. 
Originally committed to SVN as r3490.
 2009-09-05 20:19:13 +00:00
Amar Takhar
7bbf2e6ce8 * Add a check and warnming message if X_CFLAGS / X_LIBS isn't set (and a note that you need Imake) 
* Remove two lines that have been commented for a year
 * Fix some error message wording.

Originally committed to SVN as r3489.
 2009-09-05 19:53:18 +00:00
Amar Takhar
c89dcae7fc Don't attempt to draw a NULL bitmap, OSX doesn't like this. (i'd gather that none of the other platforms do either but on osx it causes a crash. 
Originally committed to SVN as r3488.
 2009-09-05 04:06:38 +00:00
Amar Takhar
53b3f8468c Remove old MacRegisterDefaultTypeAndCreator that no longer wxist in wxCocoa. Add a note about how this is handled on unix and a todo item for fixing this on OSX. 
Originally committed to SVN as r3487.
 2009-09-05 03:56:45 +00:00
Amar Takhar
e545c96dc8 OSX doesn't like it when combo boxes are empty, so init styles to "Default" and actor to "Actor". 
Originally committed to SVN as r3485.
 2009-09-05 02:24:52 +00:00
Amar Takhar
2d96c5bf4b Remove a bunch of __WXMAC__ entries that are no longer required. 
* Options uses a TreeBook like every other platform
 * Browse button now works in osx
 * wxGLCanvas is now the same as windows/unix

Originally committed to SVN as r3484.
 2009-09-05 01:16:23 +00:00
Amar Takhar
878f451d72 Remove an old hack required for wx2.8, this is no longer required for 2.9. Closes #850. 
Originally committed to SVN as r3483.
 2009-09-04 05:12:49 +00:00
Amar Takhar
c494b694a0 Disable setting of .DS_Store for now. 
Originally committed to SVN as r3482.
 2009-09-04 02:38:30 +00:00
Amar Takhar
99f421bf73 Set the .DS_Store file in the temp dmg directory rather than after it's mounted. jfs reported finder crashing after updating to 10.5.8. Setting it this way should work and avoid the issue of .DS_Store changing randomly as a folder won't show up on the desktop like a mounted image will. 
Originally committed to SVN as r3481.
 2009-09-04 02:16:39 +00:00
Amar Takhar
5a12ee807b Whoops, remove one last evil #pragma once that was left in while developing. 
Originally committed to SVN as r3480.
 2009-09-03 07:18:43 +00:00
Amar Takhar
ccf71021af Sort the name map. 
Originally committed to SVN as r3478.
 2009-09-03 07:12:48 +00:00
Amar Takhar
ad542ab8fc Drop the curl version from 7.19.2 to 7.18.2 beacuse debian/ubuntu have ancient versions installed. 
Originally committed to SVN as r3477.
 2009-09-03 07:10:57 +00:00
Amar Takhar
930f593d6a dd the beginings of the Aegisub Reporter, this is my first C++ program from scratch. (yes, that's a disclaimer) 
What's left to be done:
  * Crash support. (only works for 'reports')
  * UI cleanups.
  * Interfacing with Aegisub to get proper metrics.
  * OSX support.
  * Windows support. (someone else will have to do this)
  * Server-side code.

There's probably a lot of other things I'm forgetting, anyone is free to commit to this, if you want to make major changes let me know beforehand.

Originally committed to SVN as r3475.
 2009-09-03 06:53:55 +00:00
Amar Takhar
1155d1bcf8 wxUSE_STACKWALKER is defined to 0/1, so #ifdef doesn't work. (noticed by plork) 
Originally committed to SVN as r3474.
 2009-09-03 06:03:38 +00:00
Amar Takhar
95812a6c79 Mark DecodePathMaybeRelative as depreciated this is a legacy function that's a pain and no longer required for 2.2 it needs to be removed eventually. 
Originally committed to SVN as r3473.
 2009-09-03 05:27:49 +00:00
Amar Takhar
78b0765608 Vastly simplify saving of backup .ass files when crashing. 
* Remove "Autorecovery path" option, this should not be user configurable.
 * Crashes are now saved as recovered/YYYY-MM-DD-HHMMSS_<name>.ass (no pruning)

Originally committed to SVN as r3472.
 2009-09-03 05:27:11 +00:00
Amar Takhar
01df6ba169 Remove the dual exception messages and strip it down to 1 short one, removing all references to crashlog.txt. 
Originally committed to SVN as r3471.
 2009-09-02 20:46:15 +00:00
Amar Takhar
bf275da4de Revert r3462, this is the same issue as described in r3466. Someone on windows will need to sort this out. 
Originally committed to SVN as r3470.
 2009-09-02 11:03:52 +00:00
Amar Takhar
65d2eda681 Silence warnings in MatroskaParser.c 
Originally committed to SVN as r3469.
 2009-09-02 10:06:25 +00:00
Amar Takhar
4aa6975a8d Whoops, I mis-placed the parentheses in r3458. 
Originally committed to SVN as r3468.
 2009-09-02 10:04:36 +00:00
Amar Takhar
46c824442b Remove useless typedef 
Originally committed to SVN as r3467.
 2009-09-02 10:04:03 +00:00
Amar Takhar
e1a23412ac Revert r3461.. on unix iconv requires const char**, however for whatever reason msvc is complaining it can't convert it to char**. I have no idea why someone on windows will have to debug it. 
Originally committed to SVN as r3466.
 2009-09-02 09:40:52 +00:00
Amar Takhar
430286cf69 Silence warnings for the pulseaudio player. 
Originally committed to SVN as r3465.
 2009-09-02 09:00:03 +00:00
Amar Takhar
3aa7424998 Sprinkle const to remove warnings, add {} behind a while loop. 
Originally committed to SVN as r3464.
 2009-09-02 08:48:07 +00:00
Amar Takhar
7237e44291 Switch from long to wxCoord to remove warnings. 
Originally committed to SVN as r3463.
 2009-09-02 08:45:09 +00:00
Amar Takhar
256671d666 Add (const char**) cast to inptr in iconv to silence warning. 
Originally committed to SVN as r3462.
 2009-09-02 08:41:29 +00:00
Amar Takhar
a02a63c4e5 Sprinkle const to remove warnings. 
Originally committed to SVN as r3461.
 2009-09-02 08:31:58 +00:00
Amar Takhar
89284f5a1c Sprinkle const to remove warnings. 
Originally committed to SVN as r3460.
 2009-09-02 08:28:30 +00:00
Amar Takhar
2bd2b7f3a3 Add empty {}'s after while statements to silence warnings (and for safety! 
Originally committed to SVN as r3459.
 2009-09-02 08:26:52 +00:00
Amar Takhar
a16c8ed838 Add parentheses to silence warning. (and for clarity) 
Originally committed to SVN as r3458.
 2009-09-02 08:23:18 +00:00
Amar Takhar
24c7ceb0ab Add parentheses to silence warning. (and for clarity) 
Originally committed to SVN as r3457.
 2009-09-02 08:21:09 +00:00
Amar Takhar
aacc50702f Add empty {}'s after while statements to silence warnings (and for safety! 
Originally committed to SVN as r3456.
 2009-09-02 08:19:24 +00:00
Amar Takhar
586f2297fc Add const to langs[] to silence warnings. 
Originally committed to SVN as r3455.
 2009-09-02 08:18:11 +00:00
Amar Takhar
eceb72d95e Add (const char*) to silence warning to strcmp. 
Originally committed to SVN as r3454.
 2009-09-02 08:10:59 +00:00
Amar Takhar
eb807fea3d Add (char *) before string constant to silence warning. to ass_read_memory. 
Originally committed to SVN as r3453.
 2009-09-02 08:06:51 +00:00
Amar Takhar
77e2eaef04 Comment two unused variables to silence warnings. 
Originally committed to SVN as r3452.
 2009-09-02 08:04:45 +00:00
Amar Takhar
aef7375ddb * Add a new define WITH_EXCEPTIONS to allow exception handling to be forced on when in debug mode. 
* Add --enable-debug-exceptions to set WITH_EXCEPTIONS.
 * Fix precompiled header msg using AC_RESULT. (forgot this in the original patch)

Originally committed to SVN as r3451.
 2009-09-02 07:59:17 +00:00
Amar Takhar
1af100f284 Supplant ${HOME} with /home/verm, I forgot that the buildslaves run with an extremely limited env. This isn't a perm solution but it'll get us building for now. 
Originally committed to SVN as r3450.
 2009-09-02 05:01:54 +00:00
Amar Takhar
ec28310df9 Sort ass_parse.c into the alphabet. (like the rest) 
Originally committed to SVN as r3449.
 2009-09-02 04:01:20 +00:00
Grigori Goronzy
6ccb1a5516 Fix inline function prototypes in libass. 
Originally committed to SVN as r3448.
 2009-09-02 03:29:35 +00:00
Grigori Goronzy
a9b80dea4c Update libass and adjust to API changes. 
Update the internal libass copy to git commit cf7c6e4c and fix the
libass provider; libass types were renamed.

Originally committed to SVN as r3446.
 2009-09-02 01:23:51 +00:00
Grigori Goronzy
f263c0f599 Fix lots of spelling and grammar errors in the German translation 
(and some blatantly obvious mistranslations).

Originally committed to SVN as r3445.
 2009-09-02 01:23:46 +00:00
Niels Martin Hansen
64c642c142 Revert r3431, it breaks the clipboard on Windows and is in fact also incorrect usage of the primary selection in X11 context. (I have never heard of anyone claiming clipboard usage not working on X11 before.) 
This comment is in `include/wx/clipbrd.h`:
{{{
    // this allows to choose whether we work with CLIPBOARD (default) or
    // PRIMARY selection on X11-based systems
    //
    // on the other ones, working with primary selection does nothing: this
    // allows to write code which sets the primary selection when something is
    // selected without any ill effects (i.e. without overwriting the
    // clipboard which would be wrong on the platforms without X11 PRIMARY)
}}}
Note that it says that primary selection enabled causes the clipboard to do nothing on platforms that have no concept of primary selection, such as Windows and Mac.

On X11 the primary selection should only reflect an active selection of text (or similar) that the user has performed, and the contents of the primary selection buffer will essentially change all the time as the user changes selection. When the user chooses to explicitly copy something to the clipboard (as is the case with Aegisub, the only operation supported by us currently) the data is placed in a less ephemeral buffer which is the actual clipboard, separate from the primary selection, allowing the user to change the primary selection further without affecting the clipboard.

Originally committed to SVN as r3443.
 2009-08-28 21:45:01 +00:00
Niels Martin Hansen
b1225cdd1f Correct a use of wx event handling, which should also make FrameMain not require friend access to AudioDisplay. 
Originally committed to SVN as r3442.
 2009-08-28 21:15:39 +00:00
Amar Takhar
28a79d49ac Whoops, I nuked the reference counter initilisation by accident. in r3440. 
Originally committed to SVN as r3441.
 2009-08-25 05:31:20 +00:00
Amar Takhar
3eff6459cb * Clean up doxygen comments. 
* Fix spacing between blocks.
 * Add some debugging info.

Originally committed to SVN as r3440.
 2009-08-25 05:17:07 +00:00
Amar Takhar
e0f84274b0 Add the languages button that was missed in r3437. 
Originally committed to SVN as r3439.
 2009-08-22 03:59:09 +00:00
Amar Takhar
3de6c63ddd Reformat the 'Enter aspect ratio' text to be formatted as a block rather than a very wide string that looked silly. 
Originally committed to SVN as r3438.
 2009-08-22 03:56:02 +00:00
Amar Takhar
775c73de29 Add new icons from Kaverin. 
Originally committed to SVN as r3437.
 2009-08-22 03:51:00 +00:00
Amar Takhar
0def838ef2 Add modified buttons from r3435. 
Originally committed to SVN as r3436.
 2009-08-22 03:50:12 +00:00
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
Amar Takhar
6cae404100 Use /home/verm in lieu of ~ as it won't get expanded. 
Originally committed to SVN as r3422.
 2009-08-16 22:01:38 +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
Amar Takhar
bafe88cf38 Add '~/build/wx/share/aclocal' to ACLOCAL_FLAGS so autogen can find the correct wxwin.m4.. not sure if this will work, we'll see. 
Originally committed to SVN as r3420.
 2009-08-16 05:18:33 +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