diff options
| author | Crystalwarrior <varsash@gmail.com> | 2019-10-05 20:32:41 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2019-10-05 20:32:41 +0300 |
| commit | 2956a183b4203d9362d62d05ed251c6f934ef090 (patch) | |
| tree | 3909d31aca9d532912dd8cdedee5349a20cd6450 /include | |
| parent | bc8158cc96dd36a18ba18b0271331463cd81c497 (diff) | |
| parent | 9f543f9ef7109340142134124e8bda6c9f750a18 (diff) | |
Merge branch 'bass-hell'
Diffstat (limited to 'include')
| -rw-r--r-- | include/aomusicplayer.h | 7 | ||||
| -rw-r--r-- | include/courtroom.h | 6 | ||||
| -rw-r--r-- | include/datatypes.h | 7 |
3 files changed, 17 insertions, 3 deletions
diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h index 15014af..52c97c3 100644 --- a/include/aomusicplayer.h +++ b/include/aomusicplayer.h @@ -25,11 +25,11 @@ public: const int m_channelmax = 4; //These have to be public for the stupid sync thing -// QWORD loop_start = 0; -// QWORD loop_end = 0; + QWORD loop_start = 0; + QWORD loop_end = 0; public slots: - void play(QString p_song, int channel=0, bool crossfade=false); + void play(QString p_song, int channel=0, bool loop=false, int effect_flags=0); void stop(int channel=0); private: @@ -44,6 +44,7 @@ private: // Channel 2 = extra // Channel 3 = extra HSTREAM m_stream_list[4]; + HSYNC loop_sync[4]; }; #elif defined(QTAUDIO) class AOMusicPlayer diff --git a/include/courtroom.h b/include/courtroom.h index e800415..4b6ccc3 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -396,6 +396,9 @@ private: QString effect = ""; + //Music effect flags we want to send to server when we play music + int music_flags = 0; + int defense_bar_state = 0; int prosecution_bar_state = 0; @@ -643,6 +646,9 @@ private slots: void on_music_search_edited(QString p_text); void on_music_list_double_clicked(QTreeWidgetItem *p_item, int column); void on_music_list_context_menu_requested(const QPoint &pos); + void music_fade_out(bool toggle); + void music_fade_in(bool toggle); + void music_synchronize(bool toggle); void music_list_expand_all(); void music_list_collapse_all(); void on_area_list_double_clicked(QModelIndex p_model); diff --git a/include/datatypes.h b/include/datatypes.h index 835cf8f..921f613 100644 --- a/include/datatypes.h +++ b/include/datatypes.h @@ -110,4 +110,11 @@ enum CHAT_MESSAGE EFFECTS }; +enum MUSIC_EFFECT +{ + FADE_IN = 1, + FADE_OUT = 2, + SYNC_POS = 4 +}; + #endif // DATATYPES_H |