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

2995 commits

Author SHA1 Message Date
Amar Takhar
ae7d00a57e Fix and de-wxify audio_manager.cpp 
Originally committed to SVN as r5326.
 2011-02-09 02:28:43 +00:00
Amar Takhar
185721837b s/Audio/FFmpegSourceAudioProvider/, originally I was planning something different now we're moving all media-related code, also replace missing public identifier from the class decleration. 
Originally committed to SVN as r5325.
 2011-02-09 02:28:24 +00:00
Amar Takhar
c603c21b86 Print a message to the user and exit(1) if HOME is not set in the users environment. 
Originally committed to SVN as r5324.
 2011-02-08 22:40:55 +00:00
Amar Takhar
436ea23e4c Instantiate agi::Path, I have no idea if this works on windows since my build is still broken and jfs' code is untested. If someone else doesn't get to it I'll see about fixing my build and making it work. (if it's even broken...) 
Originally committed to SVN as r5323.
 2011-02-08 05:05:54 +00:00
Amar Takhar
355ad91105 * Instead of ~ use getenv("HOME") to get the users home directory. 
* Fix Locale() to return P_LOCALE
 * Change data and doc values to P_DATA and P_DOC.

Originally committed to SVN as r5322.
 2011-02-08 04:22:52 +00:00
Amar Takhar
961c1245f7 Remove const in path.cpp (missed in r5320) 
Originally committed to SVN as r5321.
 2011-02-08 03:53:34 +00:00
Amar Takhar
bf05289495 * Remove misplaced const on a void method. 
* Forward declare Options to avoid including options.h in the header.

Originally committed to SVN as r5320.
 2011-02-08 03:48:00 +00:00
Niels Martin Hansen
7ae6e6da88 Completely untested implementation of agi::Path for Windows. 
Originally committed to SVN as r5319.
 2011-02-08 00:21:42 +00:00
Amar Takhar
78ed8e3694 Add stub path file for Windows and hand-edit vcproj to include the file. 
Originally committed to SVN as r5318.
 2011-02-07 18:02:26 +00:00
Amar Takhar
b3c5bb6e92 Add corrected default_path.json which should have been in r5315. 
Originally committed to SVN as r5317.
 2011-02-07 18:02:04 +00:00
Amar Takhar
0a54e9ca06 Fix inclusion of config.h, when I was writing this I added a relative path directly to acconf.h 
Originally committed to SVN as r5316.
 2011-02-07 17:36:24 +00:00
Amar Takhar
a35962923f Finish agi::Path so we can actually use it, our current path system is brutal and I needed this for libmedia. I'll be adding OS X support shortly: someone else will have to figure out what to do with windows it's completely trivial see unix/path.cpp and check libaegisub/path.h for the return values. 
Originally committed to SVN as r5315.
 2011-02-07 16:39:49 +00:00
Amar Takhar
7b06c334aa Add missing headers and change StdioProgressSink() to use std::cout and friends. 
Originally committed to SVN as r5314.
 2011-02-07 00:46:49 +00:00
Amar Takhar
e27c3e15b8 Add several progress factories to handle progress bars. The GUI version will come from code within aegisub. 
Originally committed to SVN as r5313.
 2011-02-07 00:12:57 +00:00
Amar Takhar
73913fb0b8 Remove mutex.h from common/log.cpp until the windows build is fixed. 
Originally committed to SVN as r5312.
 2011-02-06 20:45:46 +00:00
Amar Takhar
874950382c s/acconf.h/config.h/ -- I forgot I actually fixed this when adding mutex.h so it was already working with the exception of the namespace change. 
Originally committed to SVN as r5311.
 2011-02-06 20:19:25 +00:00
Amar Takhar
4968fc2b55 Fix ram audio provider: this uses mutex.h (from google) in libaegisub and switches to use agi::io. The progress code has been stubbed out as well as a few path methods. There's no reason to guess at fixing them the only way to do it is after it's actually put into use. 
Originally committed to SVN as r5310.
 2011-02-06 19:52:50 +00:00
Amar Takhar
2edbc8c8c1 Fix mutex.h so we can actually use it. 
Originally committed to SVN as r5309.
 2011-02-06 19:50:59 +00:00
Amar Takhar
3d460ca31f Fix video cache, just needed to stub out one option which will be made a param to the constructor. 
Originally committed to SVN as r5308.
 2011-02-06 19:28:17 +00:00
Amar Takhar
15dab81b91 Fix ram audio provider (this stubs out a few lines used for progress updating. 
Originally committed to SVN as r5307.
 2011-02-06 18:48:42 +00:00
Amar Takhar
2ce135b612 Copy colourspace.(c|h) into libmedia and hack out wx. 
Originally committed to SVN as r5306.
 2011-02-06 03:59:13 +00:00
Amar Takhar
0c15005cc2 Add files to media namespace. 
Originally committed to SVN as r5305.
 2011-02-06 03:32:18 +00:00
Amar Takhar
37bcd0cc12 Fix dummy and pcm audio providers. 
Originally committed to SVN as r5304.
 2011-02-06 03:14:18 +00:00
Amar Takhar
65d216e60d Move dummy.h to dummy_audio.h 
Originally committed to SVN as r5303.
 2011-02-06 03:10:34 +00:00
Amar Takhar
f16fb6bb5f Add fix convert and downmix audio providers. 
Originally committed to SVN as r5302.
 2011-02-06 03:09:59 +00:00
Amar Takhar
e55ad2ed4d Add files to media namespace 
Originally committed to SVN as r5301.
 2011-02-06 03:08:51 +00:00
Amar Takhar
e18ad3768b Switch namespace to media and use VideoProvider 
Originally committed to SVN as r5300.
 2011-02-06 03:02:45 +00:00
Amar Takhar
0ca6266c86 Add missing } to close the namespace. 
Originally committed to SVN as r5299.
 2011-02-06 03:02:13 +00:00
Amar Takhar
f8b4b30cf8 Various fixes: 
* svn:ignore
 * rename 'agi' namespace to 'media'
 * Remove some hacks required before bringing in provider code.

Originally committed to SVN as r5298.
 2011-02-06 02:58:49 +00:00
Amar Takhar
97abbf13ce Remove exception.h, this used to be media.h in libaegisub however it's become moot after bringing in the provider headers from aegisub. 
Originally committed to SVN as r5297.
 2011-02-06 02:57:47 +00:00
Amar Takhar
f486f8dea8 Commit missed changes to libaegisub/Makefile to remove media code. 
Originally committed to SVN as r5296.
 2011-02-06 00:07:19 +00:00
Amar Takhar
ff602f7f2a Copy aegisub/(video|audio)_provider.h to libmedia/(video|audio).h 
Originally committed to SVN as r5295.
 2011-02-06 00:04:55 +00:00
Amar Takhar
7a13a4fb10 Add Makefile, the precompiled header unfortunatly snuck into r5292 -- it's a verbatim copy from libaegisub. 
Originally committed to SVN as r5294.
 2011-02-05 23:49:26 +00:00
Amar Takhar
66b6fdcfc8 Move video_frame.cpp which was left out of r5292. 
Originally committed to SVN as r5293.
 2011-02-05 23:46:09 +00:00
Amar Takhar
511b37ee48 Move converted code out of libaegisub and into libmedia. 
Originally committed to SVN as r5292.
 2011-02-05 23:43:20 +00:00
Amar Takhar
72211ad685 Copy and rename files from src/ into libmedia/. A lot of these headers will have to go into include/*. At the moment there's no point sorting that out until we see the final relation and external api requirements. I'll first unhook all of this code from the UI to figure out what common changes are required then design the final changes for an api that the UI can use sanely. 
Originally committed to SVN as r5290.
 2011-02-05 23:34:12 +00:00
Amar Takhar
7508420000 Commit a WIP for fixing tinderbox distfile building. 
Originally committed to SVN as r5287.
 2011-02-05 22:23:31 +00:00
Amar Takhar
75711f8041 Add FFMPEG LDFLAGS to the reporter as now they're r equired to link libaegisub. It's not worth considering to split it until everything is moved over. 
Originally committed to SVN as r5286.
 2011-02-04 18:41:52 +00:00
Amar Takhar
ac2c6508dd Strategically place comments to stub out AskForTrackSelection() and CleanCache(). 
Originally committed to SVN as r5285.
 2011-02-03 18:12:42 +00:00
Amar Takhar
283eff76ac Add LDFLAGS_POST to the shared library target. 
Originally committed to SVN as r5284.
 2011-02-03 18:09:08 +00:00
Amar Takhar
d59e0dd075 Add support for removing ffms support and properly link ffms into libaegisub. 
Originally committed to SVN as r5283.
 2011-02-03 18:08:41 +00:00
Amar Takhar
e46f83e672 Add -fPIC so ffms can be linked into a shared library. 
Originally committed to SVN as r5282.
 2011-02-03 18:08:11 +00:00
Amar Takhar
a733260603 Add missing headers. 
Originally committed to SVN as r5281.
 2011-02-03 17:15:38 +00:00
Amar Takhar
ac70f229dc Re-license video_frame.(cpp|h) with permission of copyright holder (Rodrigo Braz Monteiro). 
Originally committed to SVN as r5280.
 2011-02-03 15:52:06 +00:00
Amar Takhar
ffff58d698 Compilation fixes now that ffmpegsource_common.cpp has been moved over. Everything compiles correctly now. 
Originally committed to SVN as r5279.
 2011-02-03 15:49:44 +00:00
Amar Takhar
b47dd1e220 Add mid() template to util namespace. 
Originally committed to SVN as r5278.
 2011-02-03 15:49:13 +00:00
Amar Takhar
bb4aa727d3 Add media/* to the build on Unix. 
Originally committed to SVN as r5277.
 2011-02-03 15:48:46 +00:00
Amar Takhar
36549ff724 Add media.h -- I'm not sure if this will be the perm name, it currently holds exception definitions. 
Originally committed to SVN as r5276.
 2011-02-03 15:48:18 +00:00
Amar Takhar
93ceb59b0f Move ffmpegsource_common.(cpp|h) and change the license to fit the rest of libaegisub with permission of the current license holder (Karl Blomster) 
Originally committed to SVN as r5275.
 2011-02-03 15:47:43 +00:00
Amar Takhar
bcafbe2083 Move ffms_* files over to media/ 
Originally committed to SVN as r5274.
 2011-02-03 01:18:43 +00:00
Amar Takhar
629b819e37 Move video_frame.(cpp|h) to libaegisub. The license has not been changed however I have an email sent to amz, I will change it once he responds. 
Originally committed to SVN as r5273.
 2011-02-03 01:18:14 +00:00
Amar Takhar
f5308fe65b Move video_provider_ffmpegsource.(cpp|h) and change the license to fit the rest of libaegisub with permission of the current license holder (Karl Blomster) 
Originally committed to SVN as r5272.
 2011-02-03 01:17:15 +00:00
Amar Takhar
cddfe3ed20 Wrap code under the agi namespace. 
Originally committed to SVN as r5271.
 2011-02-02 23:23:48 +00:00
Amar Takhar
cacc3516c1 This should have gone into r5269: These files were re-licensed with permission of the original author. (Karl Blomster). 
Originally committed to SVN as r5270.
 2011-02-02 23:20:03 +00:00
Amar Takhar
1219b069b1 Copy audio_provider_ffmpegsource.(cpp|h) to ./ffms_audio.(cpp|h) and remove wx usage.. The plan is to move a/v support to libaegisub and write unit tests to make sure we can open/close/seek the "official" formats we want to support. 
Originally committed to SVN as r5269.
 2011-02-02 23:11:17 +00:00
Thomas Goyne
b3562eb917 Implement the overscan mask command 
Originally committed to SVN as r5268.
 2011-01-25 04:24:19 +00:00
Thomas Goyne
95c45b3102 Remove pointless #pragma once from video_box.h 
Originally committed to SVN as r5267.
 2011-01-23 07:48:15 +00:00
Thomas Goyne
8d968e4dd5 Move the code for updating the time/frame display boxes from VideoDisplay to VideoBox 
Originally committed to SVN as r5266.
 2011-01-23 07:48:07 +00:00
Thomas Goyne
091c8170f2 Make several of VideoDisplay's members private 
Originally committed to SVN as r5265.
 2011-01-23 07:47:59 +00:00
Thomas Goyne
14420102e4 Update the frame number display and visual typesetting tool when opening a new video 
Originally committed to SVN as r5264.
 2011-01-23 07:47:52 +00:00
Thomas Goyne
10c3a2ca16 Only bind wxEVT_COMMAND_MENU_SELECTED once rather than once per command as large numbers of event handlers make wx explode 
Originally committed to SVN as r5263.
 2011-01-23 06:45:03 +00:00
Thomas Goyne
88be46c657 Add missing #include <algorithm> in ass_export_filter.cpp 
Originally committed to SVN as r5262.
 2011-01-21 06:32:02 +00:00
Thomas Goyne
41f9426634 Make the "From Video" button in the framerate transform configuration actually do something 
Originally committed to SVN as r5261.
 2011-01-21 06:09:28 +00:00
Thomas Goyne
b851e50092 Open the correct dialog in tool/export 
Originally committed to SVN as r5260.
 2011-01-21 06:09:20 +00:00
Thomas Goyne
ab00aa74ea Actually initialize the context in DialogResample 
Originally committed to SVN as r5259.
 2011-01-21 06:09:13 +00:00
Thomas Goyne
af92002d8c Redesign export filters to not be static singletons, removing the need to jump through hoops to avoid static initialization order issues 
Originally committed to SVN as r5258.
 2011-01-21 06:09:04 +00:00
Thomas Goyne
83a461ca63 Port DialogVideoDetails to agi::Context 
Originally committed to SVN as r5257.
 2011-01-21 04:57:44 +00:00
Thomas Goyne
6ad2098749 Make VideoSlider use commands for its key events 
Originally committed to SVN as r5256.
 2011-01-21 04:57:36 +00:00
Thomas Goyne
1f79d89e5b Port DialogJumpTo to agi::Context 
Originally committed to SVN as r5255.
 2011-01-21 04:57:28 +00:00
Thomas Goyne
e8b8f876bd Eliminate some uses of VideoContext::Get() 
Originally committed to SVN as r5254.
 2011-01-21 04:57:21 +00:00
Thomas Goyne
9c07798cb5 Delete some dead code in FrameMain 
Originally committed to SVN as r5253.
 2011-01-21 04:57:12 +00:00
Thomas Goyne
71daddeeb2 Convert the video box buttons over to commands 
Originally committed to SVN as r5252.
 2011-01-20 05:58:01 +00:00
Thomas Goyne
b286339ce0 Eliminate a few uses of VideoContext::Get() 
Originally committed to SVN as r5251.
 2011-01-20 05:57:53 +00:00
Thomas Goyne
9ec1e1ba79 Explicitly set Collisions to the default (Normal) in the default file so that opening and closing the properties dialog on the default file is a no-op 
Originally committed to SVN as r5250.
 2011-01-20 05:57:46 +00:00
Thomas Goyne
79e11ef5cf Convert the properties dialog over to operating on a context 
Originally committed to SVN as r5249.
 2011-01-20 05:57:38 +00:00
Thomas Goyne
5f0d5757be Make NumValidator less bizzare 
Originally committed to SVN as r5248.
 2011-01-20 05:57:30 +00:00
Thomas Goyne
a8ebc1e456 Make AssFile handle autosaving on every commit itself rather than going through FrameMain 
Originally committed to SVN as r5247.
 2011-01-20 05:57:23 +00:00
Thomas Goyne
cecaff404b Finish killing FrameMain::SaveSubtitles 
Originally committed to SVN as r5246.
 2011-01-20 05:57:15 +00:00
Thomas Goyne
5270a3bf3a Remove withCharset parameter from FrameMain::SaveSubtitles as it was never used (saving with a charset is done by exporting) 
Originally committed to SVN as r5245.
 2011-01-20 05:57:08 +00:00
Thomas Goyne
1a26edc869 Delete FrameMain::SynchronizeProject as the last use of it was removed in r5207 
Originally committed to SVN as r5244.
 2011-01-20 05:56:59 +00:00
Niels Martin Hansen
0762422b20 Super fancy property pages for configuring the build in VC10. Doesn't want to display the defaults (properly) but that's not so important :) 
Originally committed to SVN as r5243.
 2011-01-19 06:40:23 +00:00
Niels Martin Hansen
dd24ffac89 Do some grouping of source files in the VC10 project file. 
Originally committed to SVN as r5242.
 2011-01-19 04:05:30 +00:00
Thomas Goyne
ccddf8eab1 Make hotkey::check return whether any hotkeys matched, and skip events which did not match any hotkeys 
Originally committed to SVN as r5241.
 2011-01-19 03:12:46 +00:00
Thomas Goyne
ec3d1a9d35 Don't try to reorder things by swapping entries in a set 
Originally committed to SVN as r5240.
 2011-01-18 06:01:29 +00:00
Thomas Goyne
2183442089 Remove the unmodifiered frame left/right hotkeys from default 
Originally committed to SVN as r5239.
 2011-01-18 05:13:34 +00:00
Thomas Goyne
45c33ab675 Add commands for the remaining subtitles grid hotkeys and remove SubtitlesGrid::OnKeyDown entirely 
Originally committed to SVN as r5238.
 2011-01-18 05:13:26 +00:00
Thomas Goyne
c3325cb543 Remove AegisubApp::OnKeyDown 
It was an odd hack to ensure that medusa mode didn't mark keydown events
as processed (resulting in EVT_CHAR never triggering), but there should
be a better way to do this when we reintroduce global timing hotkeys.

Originally committed to SVN as r5237.
 2011-01-18 03:42:51 +00:00
Thomas Goyne
a4da8c3a61 Update libffms to r411 
Originally committed to SVN as r5236.
 2011-01-18 00:51:38 +00:00
Thomas Goyne
3f9bead41a Use the tr1 version of <tuple> when building with gcc 
Originally committed to SVN as r5235.
 2011-01-18 00:29:40 +00:00
Thomas Goyne
c9656381f1 Remove now-pointless #pragma once from audio_box.h 
Originally committed to SVN as r5234.
 2011-01-17 23:54:13 +00:00
Thomas Goyne
e0051e09e3 Use commands for most of the buttons in the audio box and add hotkey support 
Originally committed to SVN as r5233.
 2011-01-17 23:54:05 +00:00
Thomas Goyne
f79c9e57a0 Add commands for most of the audio box buttons/hotkeys 
Originally committed to SVN as r5232.
 2011-01-17 23:53:59 +00:00
Thomas Goyne
33d8dd2975 Update TooltipManager to work with commands 
Originally committed to SVN as r5231.
 2011-01-17 23:53:52 +00:00
Thomas Goyne
04a4c074b0 Add function to get the string representation of the hotkeys for a command, use it when generating the menu 
Originally committed to SVN as r5230.
 2011-01-17 23:53:46 +00:00
Thomas Goyne
cd4b032c25 Make agi::hotkey::Scan const 
Originally committed to SVN as r5229.
 2011-01-17 23:53:38 +00:00
Niels Martin Hansen
7713ea20e0 Produce a default config_windows.h file if one doesn't already exist. 
Allow setting the BUILD_CREDIT define through a property page.

Originally committed to SVN as r5224.
 2011-01-16 23:51:41 +00:00
Niels Martin Hansen
652a8c7806 Lump all the custom targets etc. for Aegisub into a single file, instead of using many. 
Also, no custom project items needed anyway.

Originally committed to SVN as r5223.
 2011-01-16 23:01:26 +00:00
Niels Martin Hansen
1e7718d30b Run TSVN's SubWCRev as part of the build. 
The detection of the tool location is tricky and doesn't seem to work entirely as it should. It Works For Me as it is now, though the property page setting doesn't show the correct default.

Originally committed to SVN as r5222.
 2011-01-16 22:42:30 +00:00
Thomas Goyne
f2df585797 Move audio display hotkeys to the Audio category 
Originally committed to SVN as r5221.
 2011-01-16 08:50:00 +00:00
Thomas Goyne
a2af06f302 Fix a few errors in the default hotkeys 
Originally committed to SVN as r5220.
 2011-01-16 08:49:53 +00:00