1 files changed, 10 insertions, 6 deletions
diff --git a/include/aocharmovie.h b/include/aocharmovie.h
index f54f5105..65ab79fe 100644
--- a/include/aocharmovie.h
+++ b/include/aocharmovie.h
@@ -1,7 +1,7 @@
 #ifndef AOCHARMOVIE_H
 #define AOCHARMOVIE_H
 
-#include <QMovie>
+#include <QImageReader>
 #include <QLabel>
 #include <QTimer>
 #include <QDebug>
@@ -21,20 +21,24 @@ public:
   void play_talking(QString p_char, QString p_emote);
   void play_idle(QString p_char, QString p_emote);
 
-  void set_flipped(bool p_flipped) {m_flipped = p_flipped;}
+  void set_frame(QImage image);
 
   void stop();
 
+  void set_flipped(bool p_flipped) {m_flipped = p_flipped;}
+
   void move(int ax, int ay);
 
   void combo_resize(int w, int h);
 
+
 private:
   AOApplication *ao_app;
 
-  QMovie *m_movie;
-  QVector<QImage> movie_frames;
+  QImageReader *m_reader;
   QTimer *preanim_timer;
+  QTimer *ticker;
+  QString last_path;
 
   const int time_mod = 60;
 
@@ -50,8 +54,8 @@ signals:
   void done();
 
 private slots:
-  void frame_change(int n_frame);
-  void timer_done();
+  void preanim_done();
+  void movie_ticker();
 };
 
 #endif // AOCHARMOVIE_H