diff options
| author | Crystalwarrior <varsash@gmail.com> | 2019-09-13 12:00:27 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2019-09-13 12:00:27 +0300 |
| commit | ab072132c30148bd7d16cfb6cbe0a8e35684d9d4 (patch) | |
| tree | cfb4b027f590e1a5c224e9ccfcd5e52d763ac294 /include/aomovie.h | |
| parent | bb8edab5798be59476557c0eae2b6aa1f4257448 (diff) | |
| parent | 86523bb101e73417e44eaae71e6cac5a11a70751 (diff) | |
Merge branch 'aomovies'
# Conflicts:
# include/aomovie.h
# src/aomovie.cpp
# src/courtroom.cpp
Diffstat (limited to 'include/aomovie.h')
| -rw-r--r-- | include/aomovie.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/aomovie.h b/include/aomovie.h index 33b31586..974559d2 100644 --- a/include/aomovie.h +++ b/include/aomovie.h @@ -16,7 +16,7 @@ public: void set_play_once(bool p_play_once); void start_timer(int delay); - void play(QString p_gif, QString p_char = "", QString p_custom_theme = "", int duration = 0); + 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(); |