Commit Graph

70 Commits

Author SHA1 Message Date
Thomas Goyne 07da6f6f1b Split json::Number into json::Double and json::Integer
Trying to decide whether an option should be an int or double after
discarding the differences between "1.0" and "1" simply isn't possible,
and even if an option was initialized correctly, if it was changed to a
round number it could get written as an int and break later.

Also convert cajun to tabs because three spaces to indent is terrible.

Originally committed to SVN as r6018.
2011-12-22 21:12:25 +00:00
Thomas Goyne 2f85e5b398 Fix osx reporter compilation. Patch by torque. Closes #1366.
Originally committed to SVN as r5899.
2011-11-20 17:34:52 +00:00
Thomas Goyne bf70b14dfa Add GL to the reporter's LDFLAGS
Originally committed to SVN as r5832.
2011-11-08 03:43:01 +00:00
Thomas Goyne 72bc33fda3 Fix compilation errors with precompiled headers disabled
Originally committed to SVN as r5484.
2011-07-16 06:42:55 +00:00
Thomas Goyne 8ccc0acc9d Fix reporter compilation errors
Originally committed to SVN as r5481.
2011-07-16 03:36:42 +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
Thomas Goyne 8c8b149236 Fix a few warnings in the reporter
Originally committed to SVN as r5219.
2011-01-16 07:18:06 +00:00
Amar Takhar 03ca62df22 Include dependency files into the Makefiles. This gives us dep tracking for headers.
Originally committed to SVN as r5162.
2011-01-10 21:27:39 +00:00
Amar Takhar 8f401a838a Add utilities to a util:: namespace for clarity.
Originally committed to SVN as r5148.
2011-01-08 19:16:11 +00:00
Amar Takhar 68aa077add Actually add util.(c|h) which should have been in r5146.
Originally committed to SVN as r5147.
2011-01-08 19:14:48 +00:00
Amar Takhar 93f8b84688 * Instantiate log class.
* Create new util file and add a config_path() function to get Aegisubs' configuration directory.
 * Header cleanu

Originally committed to SVN as r5146.
2011-01-08 19:14:02 +00:00
Amar Takhar 69af40edc6 Fix compilation of linux support in the reporter.
Originally committed to SVN as r5144.
2011-01-08 15:38:30 +00:00
Amar Takhar 55803684c3 Use -Wl for linker flags.
Originally committed to SVN as r5143.
2011-01-08 15:38:11 +00:00
Amar Takhar 4eeacb5ab9 Silence warning.
Originally committed to SVN as r5142.
2011-01-08 15:25:04 +00:00
Amar Takhar c67fe6db5d Re-add platform-specific headers and fix prototypes.
Originally committed to SVN as r5141.
2011-01-08 15:24:35 +00:00
Amar Takhar 9d5a2b41b5 Add missing headers and sort.
Originally committed to SVN as r5140.
2011-01-08 15:18:58 +00:00
Amar Takhar ef76d4b91b Remove debug printf.
Originally committed to SVN as r5139.
2011-01-08 15:17:11 +00:00
Amar Takhar 010f3c14e5 Fix reading of aegisub config values.
Originally committed to SVN as r5122.
2011-01-04 04:23:51 +00:00
Amar Takhar a0e760c9da Replace all instances of wxString with std::string where possible.
Originally committed to SVN as r5121.
2011-01-04 00:22:55 +00:00
Amar Takhar 4d3c89eebf Cache wxGL* values to speed up GL probes, also delete locale in ~Platform().
Originally committed to SVN as r5120.
2011-01-03 16:14:43 +00:00
Amar Takhar 99aff7254f * wxString is really annoying.
* Build JSON tree.

Originally committed to SVN as r5119.
2011-01-03 15:46:21 +00:00
Amar Takhar c041bb8884 * Remove all vestiges of XML.
* Generate the report in the constructor.

Originally committed to SVN as r5118.
2011-01-03 14:28:24 +00:00
Amar Takhar 22c797a5d1 Fix some longstanding bugs now that I understand wxWidgets better.
Originally committed to SVN as r5116.
2011-01-03 14:11:53 +00:00
Amar Takhar f04d721228 Remove the name map, it's no longer required.
Originally committed to SVN as r5115.
2011-01-03 13:43:39 +00:00
Amar Takhar 7514812a25 Convert rest of the values to JSON.
Originally committed to SVN as r5114.
2011-01-03 13:33:53 +00:00
Amar Takhar 4118580bb6 Add JSON stubs, remove a bunch of now obsolete code.
Originally committed to SVN as r5113.
2011-01-03 13:20:53 +00:00
Amar Takhar e35badd20a Convert more groups to JSON and simplify source further.
Originally committed to SVN as r5112.
2011-01-03 13:02:16 +00:00
Amar Takhar 5985c60ded First stab at converting the reporter to use JSON and updating it to a saner design.
Originally committed to SVN as r5111.
2011-01-03 12:00:12 +00:00
Amar Takhar 7b7b15f0a1 Include stdint.h for uintptr_t, it's odd that I've never had a problem with this on the several platforms I've built on, which excluded Gentoo of course.
Originally committed to SVN as r5003.
2010-12-14 18:17:49 +00:00
Amar Takhar 5a635ebdb3 Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage.
Originally committed to SVN as r4895.
2010-12-05 19:12:42 +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 b249faf6ce Use uintptr_t which is guaranteed to fit a pointer unlike int.
Originally committed to SVN as r4447.
2010-06-06 02:41:04 +00:00
Grigori Goronzy ba0cf4463f Delete gcc precompiled headers in distclean.
Originally committed to SVN as r4072.
2010-01-30 16:59:24 +00:00
Thomas Goyne e7465e7519 More reporter tweaks to make it actually build and run on Windows.
Originally committed to SVN as r3619.
2009-10-05 21:02:02 +00:00
Thomas Goyne d677b85b66 Add required stubs for OpenGL info to the windows platform stub.
Originally committed to SVN as r3618.
2009-10-05 20:55:13 +00:00
Amar Takhar 0cecf3c598 Add a stub class for Windows.. whoever fills this in should take over the license.
Originally committed to SVN as r3612.
2009-10-03 17:45:34 +00:00
Amar Takhar 41f39f65d7 Fix locale dir under windows, I forgot to change it after copying and pasting some code from aegisub.
Originally committed to SVN as r3611.
2009-10-03 17:37:09 +00:00
Thomas Goyne e1469154ea Create vcproj for reporter and make it build (but not be very useful) on windows.
Originally committed to SVN as r3610.
2009-10-03 17:16:52 +00:00
Grigori Goronzy b0810a7663 Wrap() after SetFont() and don't SetMinSize() to a fixed size to calculate
reporter window dimensions correctly.

Originally committed to SVN as r3603.
2009-09-29 11:56:43 +00:00
Amar Takhar c3fe549d4d Place the OpenGL info strings into their own block. OS X reports these as completely different strings it was co-incidence that the actual vendor/card info is there on FreeBSD/Linux. It's likely other operating systems (eg. Windows) does the same thing as OS X. Eventually I'll re-add vendor information for the actual card once I figure out a way to get it on BSD/OS X.
Originally committed to SVN as r3601.
2009-09-28 08:08:16 +00:00
Amar Takhar 84e17451f9 Fill in most of the hardware fields for MAC.
Originally committed to SVN as r3600.
2009-09-28 05:16:36 +00:00
Amar Takhar b7caa012da Add list of available OpenGL extensions.
Originally committed to SVN as r3598.
2009-09-27 13:26:23 +00:00
Amar Takhar c821a7e172 * Fix commandline support, I have no idea what the !OnInit block was after OnInit(), I removed it and everthing works as expected.
* Add -x switch for dumping the report to report.xml

Unfortunatly this causes a flicker of the reporter as we need to create the main frame in order to gather some desktop metrics.

Originally committed to SVN as r3597.
2009-09-27 11:30:29 +00:00
Amar Takhar 38d5f06821 * Move VideoInfo under private:
* Add doxygen docs for GetVideoInfo().

Originally committed to SVN as r3595.
2009-09-27 09:58:13 +00:00
Amar Takhar b2a7247d01 Switch GetVideoInfo to use an enum and return a single value rather than use private member variables. There are a few reasons for this:
* Over time too many private member variables will be hard to look at.
 * Speed isn't a concern, but code managability is.
 * I opted to create a custom enum rather than use GLenum to avoid polluting platform.h with OpenGL headers.

Originally committed to SVN as r3594.
2009-09-27 09:50:04 +00:00
Amar Takhar c32899df9a * Remove Video entry as duplicates what's now under Display.
* Remove unessicary 'Video ' before renderer/version/vendor entries.
 * Put entries under Hardware->Display and bump them to the top of the list.

Originally committed to SVN as r3593.
2009-09-27 09:27:44 +00:00
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