Commit graph

2053 commits

Author SHA1 Message Date
Grigori Goronzy
400365d831 Move OpenGL code down into Platform as it's portable now
Originally committed to SVN as r3592.
2009-09-27 04:15:41 +00:00
Grigori Goronzy
e0b36fdaff Use wxGL to make OpenGL usage portable
Originally committed to SVN as r3591.
2009-09-27 03:12:17 +00:00
Grigori Goronzy
9230d5360a Fix breakage due to OS X support, introduced by one of the last commits
Originally committed to SVN as r3590.
2009-09-27 02:18:09 +00:00
Grigori Goronzy
d64f10faa9 Split up video into vendor/renderer/version and acquire video
adapter info via OpenGL/GLX on Unix.

Originally committed to SVN as r3589.
2009-09-27 02:18:05 +00:00
Amar Takhar
eaf3353982 Fix location of config.dat on OSX.
Originally committed to SVN as r3588.
2009-09-27 01:53:42 +00:00
Amar Takhar
6a792f0635 Add support for OSX to the reporter, the base is from the BSD version which works seamlessly with the exception of different sysctl names. (not updated)
Originally committed to SVN as r3587.
2009-09-27 01:47:11 +00:00
Amar Takhar
e0d4dde970 Remove the actual files as well.
Originally committed to SVN as r3586.
2009-09-27 01:28:36 +00:00
Amar Takhar
877f908064 Remove the haali* files that were unintentionally introduced in r3575, they're windows-only.
Originally committed to SVN as r3585.
2009-09-27 01:26:34 +00:00
Grigori Goronzy
4d422b1997 Minor fixes to the reporter Linux support
* drop BSD-specific includes
* document CPU cores/count vs. logical CPU count
* close files properly
* return memory size in bytes

Originally committed to SVN as r3584.
2009-09-27 01:20:29 +00:00
Grigori Goronzy
6ce51f9435 Add a forward declaration which is apparently needed with certain gcc
versions

Originally committed to SVN as r3583.
2009-09-27 01:20:12 +00:00
Karl Blomster
6490c82e79 Change the way ffms2 index cache files are named to use source filename (without path) + source file's size in bytes + source file modification time, instead of just source file path + size in bytes, in order to make reusing index cache files on other computers easier. Closes #1008.
Originally committed to SVN as r3582.
2009-09-27 00:32:19 +00:00
Amar Takhar
ab269aac37 Set proper defines for the reporter.
Originally committed to SVN as r3581.
2009-09-27 00:23:32 +00:00
Karl Blomster
5217854199 Update ffms2 to r222. Fixes compilation with ancient ffmpeg's and is a better solution than verm's hack in r3578.
Originally committed to SVN as r3580.
2009-09-26 23:54:26 +00:00
Amar Takhar
16f5d0aea6 Make sure the reporter is built and installed as reporter-2.2.
Originally committed to SVN as r3579.
2009-09-26 23:09:39 +00:00
Amar Takhar
cf8b0ae97c Comment out a couple of lines in src/core/matroskavideo.cpp and src/core/lavfvideo.cpp to get aegisub building again, thefluff is working on a proper fix.
Originally committed to SVN as r3578.
2009-09-26 23:05:47 +00:00
Amar Takhar
8802e0ba3d Remove -I../src from ffms, it hasn't been needed for a very long time.
Originally committed to SVN as r3577.
2009-09-26 22:58:56 +00:00
Karl Blomster
9d80eb066f Updating ffms2 to r221 (2.12), step 3/3: Aegisub interface
Originally committed to SVN as r3576.
2009-09-26 21:58:00 +00:00
Karl Blomster
6e39199cb4 Updating ffms2 to r221 (2.12), step 2/3: makefile
Originally committed to SVN as r3575.
2009-09-26 21:56:39 +00:00
Karl Blomster
6fe92bce72 Updating ffms2 to r221 (2.12), step 1/3: sources
Originally committed to SVN as r3574.
2009-09-26 21:56:15 +00:00
Amar Takhar
8322981b47 Use wxString in lieu of std::string to stop confusion on OSX, also makes more sense..
Originally committed to SVN as r3573.
2009-09-26 21:12:15 +00:00
Amar Takhar
56ff7c2133 Fix tab alignment.
Originally committed to SVN as r3572.
2009-09-26 20:31:28 +00:00
Amar Takhar
3ba3955e2f Fix doxygen markup in platform_unix_linux.cpp.
Originally committed to SVN as r3571.
2009-09-26 20:29:25 +00:00
Amar Takhar
71065e6f66 Clarify what Features2 can be.
Originally committed to SVN as r3570.
2009-09-26 20:19:36 +00:00
Amar Takhar
e9c5762cf7 Remove unused header.
Originally committed to SVN as r3568.
2009-09-26 20:08:52 +00:00
Amar Takhar
db35bacceb Use elif instead of nested ifdefs.
Originally committed to SVN as r3567.
2009-09-26 20:05:54 +00:00
Amar Takhar
ecc15a9935 Add the reporter subdir to Makefile.am so it gets built.
Originally committed to SVN as r3565.
2009-09-26 20:00:34 +00:00
Amar Takhar
e13ca226fb Document the platform class and fix doxygen markup.
Originally committed to SVN as r3564.
2009-09-26 19:59:24 +00:00
Niels Martin Hansen
9104079dab Uncomment stuff to close #716.
Originally committed to SVN as r3563.
2009-09-26 19:44:41 +00:00
Grigori Goronzy
a299f79515 Basic Linux support for the reporter.
Gather basic CPU and memory information by parsing /proc/cpuinfo and
/proc/meminfo.

Originally committed to SVN as r3562.
2009-09-26 16:44:36 +00:00
Grigori Goronzy
ce6cdd77ce Fix reporter compilation without precompiled headers
Originally committed to SVN as r3561.
2009-09-26 14:53:27 +00:00
Amar Takhar
4f01dab280 Add dynamic build support for *bsd and linux.
Originally committed to SVN as r3560.
2009-09-26 14:50:24 +00:00
Amar Takhar
c7bbf95c9b Add quotes around PROJECT_NAME so the space doesn't get swallowed.
Originally committed to SVN as r3559.
2009-09-26 09:40:49 +00:00
Amar Takhar
c98fe933a4 Add @ingroup tags and another doxygen comment.
Originally committed to SVN as r3558.
2009-09-26 09:38:17 +00:00
Amar Takhar
16a6616da7 Fix misnaming of a group (s/Unix/unix/)
Originally committed to SVN as r3557.
2009-09-26 09:31:08 +00:00
Amar Takhar
6c0e38b868 Fix a whole bunch of doxygen markup errors. Also add missing docs.
Originally committed to SVN as r3555.
2009-09-26 09:22:54 +00:00
Amar Takhar
3d08e60f5b Fix main index.
Originally committed to SVN as r3554.
2009-09-26 09:19:12 +00:00
Amar Takhar
9df3ce3cee SRC_PWD needs to be set before TRIM.
Originally committed to SVN as r3553.
2009-09-26 08:57:26 +00:00
Amar Takhar
90da141dd4 Support split projects.
Originally committed to SVN as r3550.
2009-09-26 08:45:19 +00:00
Amar Takhar
cda9ac3c3b Split doxygen generation into two parts, one for aegisub and another for the reporter.
Originally committed to SVN as r3548.
2009-09-26 08:37:12 +00:00
Amar Takhar
dcca1694ce * Follow aegisub and rename wx_pre.h to r_pre.h
* Sort headers.
 * Include missing c/c++ std headers into r_pre.h

Originally committed to SVN as r3547.
2009-09-21 04:53:51 +00:00
Karl Blomster
fcd8f4e04e Throw an error instead of crashing if user attempts to load audio with bitdepth >16bits/sample. Updates #996.
Originally committed to SVN as r3545.
2009-09-21 01:52:34 +00:00
Karl Blomster
3edb446bec Fix (?) a bug that caused VFR transformation export to be broken, which also affected certain video providers when external timecodes were used.
Originally committed to SVN as r3542.
2009-09-20 20:45:54 +00:00
Karl Blomster
57d549f538 unbreak the y4m provider
Originally committed to SVN as r3541.
2009-09-19 21:34:40 +00:00
Karl Blomster
7ba66342b0 silence a MSVC warning
Originally committed to SVN as r3540.
2009-09-19 20:15:59 +00:00
Amar Takhar
fa9c8c17f8 Remove 35 of the 39 pragma once added in r3538. I didn't realise so many would be not required. This patch isn't tested on windows, I'll fix it after the buildbot takes a run at it.
Originally committed to SVN as r3539.
2009-09-18 03:01:51 +00:00
Amar Takhar
11e1935d76 Remove include guards in favour of '#pragma once'. Normally I would use an include guard however #pragama once is easier to spot and we already used it in mst of our files, this is for the sake of consistency until they're removed.
Originally committed to SVN as r3538.
2009-09-18 02:48:31 +00:00
Amar Takhar
aea050fbee I have no idea how or why this change got in, but fix a license line wrap.
Originally committed to SVN as r3537.
2009-09-16 12:19:52 +00:00
Amar Takhar
aba73d4308 Remove 'pragma once' from colour_button.h font_file_lister.h gl_wrap.h subs_edit_ctrl.h.
Originally committed to SVN as r3536.
2009-09-16 12:18:09 +00:00
Amar Takhar
130e840028 I thought subtitles_provider.h was in src/ I didn't realise it was an include when trying to revert it. Of course I'd have noticed that beforehand if I was paying attention to what svn told me. This should have been in r3533.
Originally committed to SVN as r3535.
2009-09-11 19:21:19 +00:00
Amar Takhar
f41123aad4 Wrap shlobj.h with WIN32 again, it got removed in a previous commit.
Originally committed to SVN as r3534.
2009-09-11 18:55:33 +00:00
Amar Takhar
8504b4790d Remove '#pragma once' from 84 files that don't need it. Thanks to Plorkyeran for testing this on windows. The next step is to detangle the remaining files that currently require it.
Originally committed to SVN as r3533.
2009-09-11 18:51:48 +00:00
Amar Takhar
a874981ed7 ass_entry.h actually does need include/aegisub/exception.h, didn't notice because of precompiled headers.
Originally committed to SVN as r3532.
2009-09-11 05:04:05 +00:00
Amar Takhar
ca01bb2b86 Add an include guard in agi_pre.h, for whatever reason GCC likes to include the precompiled header twice. I've added a note that this needs to be looked at eventually.
Originally committed to SVN as r3531.
2009-09-11 04:35:45 +00:00
Amar Takhar
b0df329ce9 Remove un-needed inclusion of include/aegisub/exception.h
Originally committed to SVN as r3530.
2009-09-11 04:35:11 +00:00
Amar Takhar
b116610d12 Add missing headers that are in agi_pre.h but not the actual header, should fix the non-precompiled header build.
Originally committed to SVN as r3529.
2009-09-11 02:59:48 +00:00
Niels Martin Hansen
42a293ccca As <aegisub/exception.h> should become widely used soon enough, add it to the precompiled headers.
Protect <omp.h> from inclusion on compilers that don't support OpenMP.

Originally committed to SVN as r3528.
2009-09-11 02:49:58 +00:00
Niels Martin Hansen
d1c70ef6d2 Protect agi_pre.h from double inclusion during PCH generation in MSVC.
Originally committed to SVN as r3527.
2009-09-11 02:47:14 +00:00
Niels Martin Hansen
a3bf534b5e Fixes for internal logical consistency of exception.h. (Make sure we can actually support inner exceptions in all cases.)
Also make it follow the AGI_PRE pattern.

Originally committed to SVN as r3526.
2009-09-11 02:46:01 +00:00
Amar Takhar
774fb0f674 Fix all the headers in *., this includes:
* Wrapping all headers that are in agi_pre.h with AGI_PRE.
  * Sorting alphabetically.
  * Same operation as r3515.

Note: This is broken when precompiled headers are not in use, I'll fix that after this commit so the two changes don't get jumbled up.

Originally committed to SVN as r3525.
2009-09-11 02:36:34 +00:00
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