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

2638 commits

Author SHA1 Message Date
Thomas Goyne
0704887ad4 Save the last viewed page of the preferences dialog 
Originally committed to SVN as r4763.
 2010-08-26 18:38:31 +00:00
Thomas Goyne
daa77301eb Remove "Colour/Background/Modified" option, which was made irrelevant by r4699. 
Originally committed to SVN as r4762.
 2010-08-26 18:38:26 +00:00
Thomas Goyne
069581b9be Make the preferences dialog actually update the configuration 
Originally committed to SVN as r4761.
 2010-08-26 18:38:20 +00:00
Thomas Goyne
5721003219 Split colors into two columns so that the preferences dialog is less awkwardly shaped 
Originally committed to SVN as r4760.
 2010-08-26 18:38:14 +00:00
Thomas Goyne
5d5f24cbd8 Remove Tip of the Day setting from default_config.json 
Originally committed to SVN as r4759.
 2010-08-26 18:38:09 +00:00
Thomas Goyne
f15dd92fb1 Change App/Auto/Check For Updates to a bool so that the correct control is used in the preferences dialog 
Originally committed to SVN as r4758.
 2010-08-26 18:38:03 +00:00
Thomas Goyne
27a7c41a44 Fix option name for auto-updates checkbox 
Originally committed to SVN as r4757.
 2010-08-26 18:37:46 +00:00
Thomas Goyne
80af629325 Remove dangling reference to boost files in the makefile 
Originally committed to SVN as r4756.
 2010-08-26 18:03:00 +00:00
Thomas Goyne
06f0c231b0 Make the advanced video options page a child of the advanced options 
Originally committed to SVN as r4755.
 2010-08-25 19:31:38 +00:00
Thomas Goyne
34c571b81b Change the one use of boost::shared_ptr to std::tr1::shared_ptr and remove the local copy of boost::shared_ptr 
Originally committed to SVN as r4754.
 2010-08-25 19:31:31 +00:00
Thomas Goyne
574236875c Fix assertion failure in 32-bit builds 
Originally committed to SVN as r4753.
 2010-08-25 19:31:26 +00:00
Thomas Goyne
a6abc79b95 Add inttypes.h to the precompiled header 
Originally committed to SVN as r4752.
 2010-08-25 19:31:20 +00:00
Thomas Goyne
459b9e317d Display an error when the config file is corrupted rather than just crashing 
Originally committed to SVN as r4751.
 2010-08-25 19:31:11 +00:00
Amar Takhar
e6b41058d8 Remove duplicate inclusion of <libaegisub/log.h>. 
Originally committed to SVN as r4750.
 2010-08-22 21:22:49 +00:00
Amar Takhar
6742a17649 Add a workaround for [Hotkeys] header detection, all this code will go away when the Hotkeys are redone. 
Originally committed to SVN as r4749.
 2010-08-17 04:44:18 +00:00
Thomas Goyne
d83c59819f Fix deadlock on pthreads-using platforms 
Originally committed to SVN as r4748.
 2010-08-16 03:06:28 +00:00
Amar Takhar
714fa65071 Rename 2.2 to 3.0 as this will now be the next version outside of 2.1. 
Originally committed to SVN as r4747.
 2010-08-15 18:40:58 +00:00
Amar Takhar
b50255bfe9 Re-add code removed in r4745 and conditionalise it under BUILD_DARWIN. 
Originally committed to SVN as r4746.
 2010-08-15 16:55:52 +00:00
Amar Takhar
2bcaf14892 Remove some test code added when fixing the OSX build that slipped into r4743. 
Originally committed to SVN as r4745.
 2010-08-14 18:57:29 +00:00
Amar Takhar
3c5d4bc97e Relicense libosxutil code (osx/util.cpp and include/util_osx.h) using the same license as the rest of the library. (obsd/2-clause bsdl) Done with the permission of current copyright holder jfs (Niels Martin Hansen). 
Originally committed to SVN as r4744.
 2010-08-14 18:45:41 +00:00
Amar Takhar
d4ba1f48ca Remove libosxutil and fold it into libaegisub. 
Originally committed to SVN as r4743.
 2010-08-14 17:42:37 +00:00
Amar Takhar
0d12775f4b osx-bundle target fixes. 
Originally committed to SVN as r4742.
 2010-08-14 17:38:37 +00:00
Thomas Goyne
b9f9b0a80a Fix potential divide-by-zero with wxGTK when opening video. 
Originally committed to SVN as r4741.
 2010-08-13 05:51:31 +00:00
Thomas Goyne
9c93198c3b Honor the user's default zoom when possible rather than always overriding it based on the size of the window 
Originally committed to SVN as r4740.
 2010-08-13 05:51:26 +00:00
Thomas Goyne
768f74ae3c Make VideoDisplay set its initial zoom itself rather than FrameMain 
Originally committed to SVN as r4739.
 2010-08-13 05:51:17 +00:00
Amar Takhar
6bb5dd0bfd Use OSXSetModified() from wx instead of using Carbon directly. 
Originally committed to SVN as r4738.
 2010-08-13 00:33:54 +00:00
Amar Takhar
61656d633b * Make GL_EXT() a noop on OS X, it's not required. 
* Conditionalise glMultiDrawArraysFallback since it's not used on OS X.
 * Stub APIENTRY at the top of visual_tool_vector_clip.cpp, this should never be added to a header but at the top of source files.

Originally committed to SVN as r4737.
 2010-08-13 00:24:35 +00:00
Amar Takhar
ce28cca7c6 Include missing header. 
Originally committed to SVN as r4736.
 2010-08-12 14:36:09 +00:00
Amar Takhar
9f1b1f1cad Use std::string on osx/unix as well as osx doesn't have strndup. 
Originally committed to SVN as r4735.
 2010-08-12 14:34:54 +00:00
Amar Takhar
0b4092b602 Fix compilation on Unix/OSX (fix from Plork) 
Originally committed to SVN as r4734.
 2010-08-12 10:13:29 +00:00
Amar Takhar
cbbb917dce Use $INTLTOOLIZE instead of intltoolize in autogen.sh to ensure the binary, if specified is actually called. I'm amazed noone has noticed this before. 
Originally committed to SVN as r4733.
 2010-08-12 09:23:19 +00:00
Thomas Goyne
58ca596359 Define NOMINMAX on Windows and remove workarounds for problems caused by those macros. 
Originally committed to SVN as r4732.
 2010-08-12 06:39:49 +00:00
Thomas Goyne
a400800b54 Remove the override for fonts.conf location on Windows as the default is close enough to sensible. 
Originally committed to SVN as r4731.
 2010-08-12 01:12:00 +00:00
Thomas Goyne
c8851828cd Get the libass provider working on Windows. Requires a valid fontconfig config file (currently not included). 
Originally committed to SVN as r4730.
 2010-08-10 05:50:14 +00:00
Thomas Goyne
e7eba4c00d Add Select All and Select None buttons to the import style from script dialog. 
Originally committed to SVN as r4729.
 2010-08-10 01:47:29 +00:00
Thomas Goyne
87fac1c571 Reduce flickering when changing zoom level. 
Originally committed to SVN as r4728.
 2010-08-03 20:21:25 +00:00
Thomas Goyne
d5cbb534f8 Make VideoDisplay's size calculations slightly less convoluted. 
Originally committed to SVN as r4727.
 2010-08-03 20:21:19 +00:00
Thomas Goyne
11d67ec6ae Fix updating of the scroll bar after opening a new file. 
Originally committed to SVN as r4726.
 2010-08-03 20:21:13 +00:00
Thomas Goyne
f66ef36f93 Change criteria for when opened files should be backed up; rather than not backing up binary files (which aren't detected correctly anymore and always was sort of kludgy), don't back up files which are not in a format we can't write. 
Originally committed to SVN as r4725.
 2010-08-03 20:21:04 +00:00
Thomas Goyne
3f954dadcc Merge OS X color picker fixes in r3996 and r3997 from 2.1.8. Closes #1114. 
Originally committed to SVN as r4724.
 2010-08-03 02:16:26 +00:00
Thomas Goyne
2a51ad837e Fix non-precompiled header compilation 
Originally committed to SVN as r4723.
 2010-08-02 22:14:11 +00:00
Thomas Goyne
46be23073e Fix a few gcc warnings 
Originally committed to SVN as r4722.
 2010-08-02 20:25:29 +00:00
Thomas Goyne
ce97d995b4 Also remove timecodes and keyframes from the MRU lists when they cannot be found. Updates #717. 
Originally committed to SVN as r4721.
 2010-08-02 08:18:53 +00:00
Thomas Goyne
596ad4d65d Add missing throw statement 
Originally committed to SVN as r4720.
 2010-08-02 08:18:45 +00:00
Thomas Goyne
caf81157f1 Fix portaudio player compilation 
Originally committed to SVN as r4719.
 2010-08-02 08:03:58 +00:00
Thomas Goyne
ff85906cdc Fix compilation errors 
Originally committed to SVN as r4718.
 2010-08-02 07:21:02 +00:00
Thomas Goyne
c10e9e3a5b Make video and audio providers throw typed exceptions. 
Don't display error messages and try other providers when the user
cancels loading a file.

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

Closes #717.

Originally committed to SVN as r4717.
 2010-08-02 06:32:01 +00:00
Thomas Goyne
71fb04cd29 Rework most of the various factories to not need an explicit helper class for each class constructable via a factory. 
Originally committed to SVN as r4716.
 2010-08-02 06:31:38 +00:00
Thomas Goyne
f0aa85dfbb Delete the quicktime provider, as it's unmaintained and doesn't work 
Originally committed to SVN as r4715.
 2010-07-27 03:52:40 +00:00
Thomas Goyne
6407e36c87 Store inner exceptions with shared_ptr rather than a bare pointer so that the inner exception survives copies 
Originally committed to SVN as r4714.
 2010-07-27 03:52:32 +00:00
Amar Takhar
e2d9241efd No need to disable as this is done when it's deleted anyway. 
Originally committed to SVN as r4713.
 2010-07-25 17:34:17 +00:00
Amar Takhar
d3077c3b8b Change emit_stdout to a private member variable, this was changed in r4575. Putting it on the stack won't work since it'll just unsubscribe which we don't want. Unfortunatly this is wrapped with _DEBUG everywhere in main.(h|cpp) if we need more debugging code in the future I'll figure out a better solution. 
Originally committed to SVN as r4712.
 2010-07-25 17:33:44 +00:00
Amar Takhar
79a67ae1ec Add some log messages when subscribing/unsubscribing emitters. 
Originally committed to SVN as r4711.
 2010-07-25 17:30:12 +00:00
Thomas Goyne
3bdf0f95c6 Remove audio_provider_stream.cpp from the makefile 
Originally committed to SVN as r4710.
 2010-07-25 05:42:36 +00:00
Thomas Goyne
d4a4db0388 Kill scrubbing code and audio_provider_stream; they were last touched four years ago and never did work. 
Originally committed to SVN as r4709.
 2010-07-25 03:11:00 +00:00
Thomas Goyne
6040334278 Kill DEBUG_AVISYNTH_CODE as it hasn't actually worked for 3.5 years. 
Originally committed to SVN as r4708.
 2010-07-23 20:34:23 +00:00
Thomas Goyne
428fc78623 Kill dangling references to dialog_tip.h 
Originally committed to SVN as r4707.
 2010-07-23 07:00:35 +00:00
Thomas Goyne
d8021262df Enable "Make times continous" when only one line is selected. Closes #822. 
Originally committed to SVN as r4706.
 2010-07-23 06:40:22 +00:00
Thomas Goyne
35e33bd036 Fix crash when video loading fails. 
Originally committed to SVN as r4705.
 2010-07-23 06:40:12 +00:00
Thomas Goyne
da0fb8cde7 Fix gcc build errors introduced in r4702 
Originally committed to SVN as r4704.
 2010-07-23 06:21:22 +00:00
Thomas Goyne
de1588cd1d Delete old tip of the day code. Closes #967. 
Originally committed to SVN as r4703.
 2010-07-23 06:16:00 +00:00
Thomas Goyne
397b234fba Move video decoding and subtitle rendering to a worker thread 
Makes the click event handler for the grid no longer slow when video
autoscroll is enabled, making it harder to accidently select multiple
lines.

Makes seeking speed no longer limited by decoding/rendering speed;
seeking faster than video can be decoded simply results in dropped
frames.

Makes editing the file while a slow-rendering frame is visible far more
responsive.

Originally committed to SVN as r4702.
 2010-07-23 05:58:39 +00:00
Thomas Goyne
926b6152f1 Fix detached video crashes. 
Originally committed to SVN as r4701.
 2010-07-23 04:15:36 +00:00
Thomas Goyne
242b1ee47b Remove deleted files from the makefile 
Originally committed to SVN as r4700.
 2010-07-20 03:28:50 +00:00
Thomas Goyne
fde4a7815d Make the subtitle edit box auto-commit all changes 
This happens to fix most of the undo issues, as it's now much harder to
have uncommitted changes to the file.

Closes #355 and #586.

Originally committed to SVN as r4699.
 2010-07-20 03:11:11 +00:00
Amar Takhar
51a75cd0fd Split the preferences to make managing the base code from the actual options. I should have done this yesterday however I completely underestimated how annoying it would be having it all in the same file. 
Originally committed to SVN as r4698.
 2010-07-19 17:53:29 +00:00
Amar Takhar
c3881ea772 Some documentation and reformatting 
Originally committed to SVN as r4696.
 2010-07-19 12:25:53 +00:00
Karl Blomster
9def56b61c fix compilation under visual studio 
Originally committed to SVN as r4695.
 2010-07-19 01:28:52 +00:00
Karl Blomster
cd810ae1c0 fix compilation of the avs provider 
Originally committed to SVN as r4694.
 2010-07-19 01:08:09 +00:00
Amar Takhar
12014b944e Remove unused macros. 
Originally committed to SVN as r4693.
 2010-07-18 23:31:21 +00:00
Amar Takhar
d8acbb205c Finish converting the rest to objects. 
Originally committed to SVN as r4692.
 2010-07-18 23:22:00 +00:00
Amar Takhar
1613a5961f Convert the Subtitles and Audio pages. 
Originally committed to SVN as r4691.
 2010-07-18 19:29:54 +00:00
Amar Takhar
dff3cb78f6 Start moving each page to it's own class, the first round of changes was intended as a proof-of-concept. Having each page as it's own object will allow for far easier handling of option changes and reverting. 
Originally committed to SVN as r4690.
 2010-07-18 16:36:31 +00:00
Amar Takhar
92d51d6f34 Move another block of code to reduce later diffs. 
Originally committed to SVN as r4689.
 2010-07-18 16:33:32 +00:00
Amar Takhar
1626024be8 Shift some code blocks around before modification to make sense of later diffs. 
Originally committed to SVN as r4688.
 2010-07-18 14:46:16 +00:00
Thomas Goyne
46d03e3e2b Refresh video display after undo/redo. 
Originally committed to SVN as r4687.
 2010-07-18 05:45:58 +00:00
Thomas Goyne
63cda2d755 Make gl contexts specific to VideoDisplays and only create/use them when the display is shown. Fixes a pile of X11-related assertion failures. 
Originally committed to SVN as r4686.
 2010-07-18 05:45:52 +00:00
Amar Takhar
f1ea264efc Revert r4684 as the change won't handle nonexistent styles correctly. updates #1232. 
Originally committed to SVN as r4685.
 2010-07-17 21:08:53 +00:00
Amar Takhar
6705e2fa61 Set the current style directly when updating the dropdown. The old way used Select() which caused an actual commit to happen. This has the side-effect of modifying the file on startup. We currently set the Actor using this method I don't see why doing the same for the Style won't work. 
Originally committed to SVN as r4684.
 2010-07-17 19:42:44 +00:00
Amar Takhar
c624b20777 Left align microseconds by 6 spaces. 
Originally committed to SVN as r4683.
 2010-07-17 17:47:59 +00:00
Amar Takhar
5755d7e1a0 Use %ld for size_t in RebuildRecentList, fixes an assert in wxString::Format. 
Originally committed to SVN as r4682.
 2010-07-16 15:44:54 +00:00
Amar Takhar
d3e9a906aa Use %ld for both wxFileOffset (off_t) and GetTicks() (time_t), also coalesce into a single wxString::Format. This fixes an assert in wx trunk. Unfortunatly it does not fix audio loading due to seperate breakage of libass in r4630:4631. closes #1228. 
Originally committed to SVN as r4681.
 2010-07-16 10:33:54 +00:00
Thomas Goyne
a32bbab0b6 Add selection-preserving logic to BaseGrid::UpdateMaps and eliminate some unnecessary updates and clears of the maps. Fixes a pile of cases where operations would result in incorrect or no selections, or scrolling to the top of the file. 
Originally committed to SVN as r4677.
 2010-07-13 05:29:08 +00:00
Thomas Goyne
4a8abae3a3 Kill options.h and options.cpp, which have been empty for a while 
Originally committed to SVN as r4676.
 2010-07-12 21:49:48 +00:00
Thomas Goyne
9d03e282ea Rewrite the recombine lines algorith to add support for arbitrary selections rather than requiring that each split line be fixed individually. 
Originally committed to SVN as r4675.
 2010-07-12 07:10:40 +00:00
Thomas Goyne
7e93d78d3a Fix crash when ActiveLine is NULL while video is loaded. 
Originally committed to SVN as r4674.
 2010-07-12 07:10:34 +00:00
Thomas Goyne
81b75d9f55 Significantly speed up AssLimitToVisibleFilter::ProcessSubs 
Originally committed to SVN as r4673.
 2010-07-11 03:31:33 +00:00
Thomas Goyne
ab27440853 Fix comment in vfr.cpp 
Originally committed to SVN as r4672.
 2010-07-11 03:31:28 +00:00
Thomas Goyne
002aad0b29 Don't call CompressForStack on copied AssFiles as the parsed data isn't copied in the first place. 
Originally committed to SVN as r4671.
 2010-07-11 03:31:19 +00:00
Thomas Goyne
4897f35dfc When deleting the last row of the grid, select the new last row rather than nothing. 
Originally committed to SVN as r4670.
 2010-07-09 07:31:56 +00:00
Thomas Goyne
c40aa7080a Eliminate almost all uses of AssFile::top. 
Originally committed to SVN as r4669.
 2010-07-09 07:31:48 +00:00
Thomas Goyne
5e22a0f151 Save selection over undo/redo. 
Originally committed to SVN as r4668.
 2010-07-09 07:31:43 +00:00
Thomas Goyne
2e5dc176db Rewrite Undo/Redo code 
Make the undo and redo stacks non-static members of AssFile, making it
theoretically possible to have multiple open AssFiles with working undo.

Slightly improve tracking of whether the file is modified: saving,
making a change, then undoing the change now results in the file being
shown as unmodified as with most programs with undo.

Add basic undo coalescing support.

Originally committed to SVN as r4667.
 2010-07-09 07:31:34 +00:00
Thomas Goyne
518e78ac6f SSA doesn't have a layer field 
Originally committed to SVN as r4666.
 2010-07-08 07:44:21 +00:00
Thomas Goyne
5c976dc0a0 Make AssDialogue::GetData ~50% faster 
Originally committed to SVN as r4665.
 2010-07-08 07:15:04 +00:00
Thomas Goyne
1da57a4be5 Make AssStyle::Clone ~15 times faster. 
Originally committed to SVN as r4664.
 2010-07-08 07:14:55 +00:00
Thomas Goyne
a59d2a8e2e Fix 64-bit compilation errors 
Originally committed to SVN as r4663.
 2010-07-08 04:50:46 +00:00
Thomas Goyne
acba2c6b63 Rewrite VFR handling in Aegisub. 
Kill vfr.h and vfr.cpp and use the libaegisub versions of them instead.

Rather than the globals VFR_Input and VFR_Output, everything related to
frame rate is now part of the video context. Most things which used to
use VFR_Output now call VideoContext::TimeAtFrame etc.; video providers,
rather than modifying VFR_Input directly, now have getters for their
frame rates which VideoContext calls. Read-only public access to
VFR_Input and VFR_Output are still provided (hopefully temporarily) for
a few things which were awkward to do through VideoContext.

The Avisynth provider now might correctly handle VFR MKVs which can be
opened with DirectShowSource but not DSS2.

Rework keyframe handling as well, so that it continues to match the vfr
handling in design and implementation.

Originally committed to SVN as r4662.
 2010-07-08 04:29:04 +00:00
Thomas Goyne
9322f95071 Rewrite vfr.cpp in libaegisub with tests. Not yet used by Aegisub itself. 
Originally committed to SVN as r4661.
 2010-07-07 05:24:16 +00:00
Thomas Goyne
929fa83dd9 Move the bulk of TextFileWriter's logic to libaegisub. 
Originally committed to SVN as r4660.
 2010-07-07 02:41:46 +00:00