Commit graph

89 commits

Author SHA1 Message Date
Andrea Odetti
edb93cbaa0 Integrate memory changes from AW.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-12-11 08:28:16 +00:00
Andrea Odetti
a5734cac10 Use GetAppleWindowTitle() from AW.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-11-29 16:37:45 +00:00
Andrea Odetti
8e6fc89384 From AW's master, AppleWin.cpp split.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-11-27 13:48:53 +00:00
Andrea Odetti
9cd8b22647 Use Frame.cpp from upstream.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-11-24 07:51:50 +00:00
Andrea Odetti
cadb72442a Use Video.cpp "as is".
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-11-22 09:36:28 +00:00
Andrea Odetti
c7a8c628e4 Changes required from upstream. 2020-11-12 18:43:04 +00:00
Andrea Odetti
3ba2cd6d98 SDL2 add audio.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-10-20 15:32:45 +01:00
Andrea Odetti
7037582907 Allow to turn the circle range of a gamepad to a square (as the Apple ][).
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-10-17 19:19:46 +01:00
Andrea Odetti
a72d19b386 Couple of fixes from upstream AW.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-10-12 20:58:32 +01:00
Andrea Odetti
65effc121d Add Quit on the Qt app.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-10-09 19:37:04 +01:00
Andrea Odetti
039bfc04c3 Fix a couple of issues with RGB modes. 2020-10-07 20:45:31 +01:00
Andrea Odetti
9515e7de2d Set window icon.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-07-11 18:46:09 +01:00
Andrea Odetti
9afb9c631f Save absolute path of the snapshot filename.
Otherwise if one starts qapple with --load-state with a relative path it does not work
(as we have cd'ed to allow loading disks).

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-07-11 18:41:09 +01:00
Andrea Odetti
9c442468f5 Compile AW's Speaker.cpp and remove custom implementation.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-07-08 16:52:00 +01:00
Andrea Odetti
a29e781de0 Reduce calls to chdir() and only do it before loading a snapshot as it helps with relative disk locations.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-07-05 18:07:13 +01:00
Andrea Odetti
38908c7d6d Fix memory leak.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-07-05 14:42:56 +01:00
Andrea Odetti
0539fd9a69 Simplify initialisation.
Just reinitialise everything on soft reboot.
Make sure audio is stopped when emulator is reinitialised.
Stop timers while reinitialising.
2020-07-04 19:59:20 +01:00
Andrea Odetti
5dee29fbf9 Make Mockingboard voice actually play.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-07-02 11:02:57 +01:00
Andrea Odetti
259428a946 Add support for a (munte) mockingboard.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-06-30 15:43:06 +01:00
Andrea Odetti
457fc184d9 Save and restore emulator window geometry as well.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-06-16 20:15:58 +01:00
Andrea Odetti
0191652565 First part of merge of new CardManager code.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-31 18:19:45 +00:00
Andrea Odetti
2462743edd Save and restore geometry.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-12 20:18:58 +00:00
Andrea Odetti
20852fcb2a Add a few command line options to run the tests automatically.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-08 20:21:35 +00:00
Andrea Odetti
187739f913 Forgotten destructors...
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-06 20:00:16 +00:00
Andrea Odetti
7c90b040ef Reduce some boilerplate with global and aw's options.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-01 19:49:11 +00:00
Andrea Odetti
177f345861 Cap time in each slice to avoid pathological cases.
E.g. when debugging.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-01 18:59:20 +00:00
Andrea Odetti
bad18cafbf Rename configuration.* options.*
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-12-01 18:40:28 +00:00
Andrea Odetti
31340919de Move Qt UI to private member.
This way it is clear which variables comes from the ui component.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-30 15:48:48 +00:00
Andrea Odetti
19c9193412 Use video mode in window title.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-29 20:18:29 +00:00
Andrea Odetti
9ca7485f52 Update VideoBenchmark code to differentiate screen image generation vs blitting.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-25 21:08:01 +00:00
Andrea Odetti
151c6c92f9 Add Video settings.
+ F9 to cycle video modes.
2019-11-24 21:06:55 +00:00
Andrea Odetti
256815eff9 Rationalise QApple options.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-24 19:30:34 +00:00
Andrea Odetti
7c61888447 Rename options -> preferenceData
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-24 17:43:43 +00:00
Andrea Odetti
4792c2eeed Remove custon video processor in favour of AppleWin's.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-22 20:32:32 +00:00
Andrea Odetti
d18269fb2d First (succesful) attempt at using NTSC code in Linux.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-20 21:23:27 +00:00
Andrea Odetti
4d0af5d3ca Added a custom version of QPainter which seems to perform much better 20%->11% CPU.
It only works if all images involved have the same format.
Using some typedefs, one can revert to the old QPixmap behaviour.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-16 17:00:35 +00:00
Andrea Odetti
54d418725e Add a few correct card names, so the snapshot loading does not fail.
But, these cards are still ignored.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-13 21:01:28 +00:00
Andrea Odetti
c4a03e0434 Rename audio -> audiogenerator
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-10 18:48:02 +00:00
Andrea Odetti
0778812560 First decent implementation of Audio Output.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-09 21:43:35 +00:00
Andrea Odetti
54a1bb4991 This is probably a better way to schedule execution.
One step ahead rather than one step behind.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-07 21:30:05 +00:00
Andrea Odetti
730e35150a Remove some warnings.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-06 22:56:08 +00:00
Andrea Odetti
fe63225065 Simplify fps count and repainting decision.
Just run @ 60 fps and repaint all the times.
Previous algorithm had a startup issue and ended up doing exactly the same.


Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-06 22:53:44 +00:00
Andrea Odetti
0a6de645e0 Incorporate chat * -> std::string conversion.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-09-21 09:58:29 +01:00
Andrea Odetti
4d2febfb42 Linux changes for current version of AppleWin.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-08-10 16:16:44 +01:00
Andrea Odetti
69ec0e7db0 Add support for RamWorks.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-04-22 16:02:06 +01:00
Andrea Odetti
90f0a6d6c4 Fix problem about removing a language card.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-04-21 20:58:54 +01:00
Andrea Odetti
224fcbce78 Add (better) support to select card in Slot 0.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-04-20 20:51:19 +01:00
Andrea Odetti
a51118cf35 Fix all disk related function due to Disk class introduction.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-04-20 16:43:52 +01:00
Andrea Odetti
629bbfb757 Add support for the LanguageCard in Slot0 switch.
(not 100% sure how it is supposed to work).


Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-04-19 20:27:17 +01:00
Andrea Odetti
6b649bee1a Follow AppleWin and rename nCyclesLeft to uExecutedCycles.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2018-04-14 18:46:00 +01:00