diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-22 19:17:55 -0500 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-22 19:17:55 -0500 |
| commit | fd1855b8d0ecaa56ae3165ad5d8f3bd65ff77a64 (patch) | |
| tree | 9c27d658dd8f19e649e1742b0fd39104a50a3ca6 /include/aoevidencedisplay.h | |
| parent | 8928aa2718378bc42d20d5bbe6c17be68d65d6f3 (diff) | |
| parent | 4617e3135ed14a28c4129154486022947fda9d82 (diff) | |
Merge KFO source unconditionally into AO2
Diffstat (limited to 'include/aoevidencedisplay.h')
| -rw-r--r-- | include/aoevidencedisplay.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/aoevidencedisplay.h b/include/aoevidencedisplay.h index 1d6280da..979a754e 100644 --- a/include/aoevidencedisplay.h +++ b/include/aoevidencedisplay.h @@ -2,11 +2,11 @@ #define AOEVIDENCEDISPLAY_H #include "aoapplication.h" +#include "aomovie.h" #include "aosfxplayer.h" #include <QDebug> #include <QLabel> -#include <QMovie> class AOEvidenceDisplay : public QLabel { Q_OBJECT @@ -17,15 +17,16 @@ public: void show_evidence(QString p_evidence_image, bool is_left_side, int p_volume); QLabel *get_evidence_icon(); void reset(); + void combo_resize(int w, int h); private: AOApplication *ao_app; - QMovie *evidence_movie; + AOMovie *evidence_movie; QLabel *evidence_icon; AOSfxPlayer *sfx_player; private slots: - void frame_change(int p_frame); + void show_done(); }; #endif // AOEVIDENCEDISPLAY_H |