Commit graph

16 commits

Author SHA1 Message Date
Andrea Odetti
f61e73b639 Move resources, bitmaps and messageboxes into Frames.
And remove a few windows.h interface functions used before.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2021-01-20 19:07:18 +00:00
Andrea Odetti
247b51b2ab Integration of GetVideo().
Part 1.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-12-28 19:42:04 +00:00
Andrea Odetti
62c8b61a6b Integrate upstream changes.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-12-12 19:57:04 +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
e2ea9c5f22 Marginally better benchmark calculation.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2020-11-21 21:01:34 +00:00
Andrea Odetti
c7a8c628e4 Changes required from upstream. 2020-11-12 18:43:04 +00: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
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
ee09f828ee Better benchmark calculation:
1) Pure Video Hi Res and Text are the same thing
2) Realistic FPS was actually wrong as it would only CPU update the video for the first 10 frames

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2019-11-29 20:19:23 +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
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
21156bb606 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	source/Disk.cpp
#	source/DiskImageHelper.h
#	source/Memory.cpp

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2018-02-03 20:35:04 +00:00
Andrea Odetti
17d75813a7 A couple of fixes.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2017-10-14 19:18:44 +01:00
Andrea Odetti
c6789ece7b Add benchmark and fix timerID values.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2017-10-14 19:18:44 +01:00
Andrea Odetti
ede695bcd6 Move VideoBenchmark to libapple to be reused.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2017-10-14 19:18:44 +01:00
Renamed from source/frontends/ncurses/benchmark.cpp (Browse further)