Merge branch '2.7-rc'

Includes full code reformat.

# Conflicts:
#	src/aomusicplayer.cpp
#	src/path_functions.cpp

1 files changed, 6 insertions, 3 deletions

diff --git a/include/aomovie.h b/include/aomovie.h
index 1f278bf..caa1baa 100644
--- a/include/aomovie.h
+++ b/include/aomovie.h
@@ -7,21 +7,23 @@
 class Courtroom;
 class AOApplication;
 
-class AOMovie : public QLabel
-{
+class AOMovie : public QLabel {
   Q_OBJECT
 
 public:
   AOMovie(QWidget *p_parent, AOApplication *p_ao_app);
 
   void set_play_once(bool p_play_once);
-  void play(QString p_gif, QString p_char = "", QString p_custom_theme = "");
+  void start_timer(int delay);
+  void play(QString p_gif, QString p_char = "", QString p_custom_theme = "",
+            int default_duration = 0);
   void combo_resize(int w, int h);
   void stop();
 
 private:
   QMovie *m_movie;
   AOApplication *ao_app;
+  QTimer *timer;
   bool play_once = true;
 
 signals:
@@ -29,6 +31,7 @@ signals:
 
 private slots:
   void frame_change(int n_frame);
+  void timer_done();
 };
 
 #endif // AOMOVIE_H