diff options
| author | Crystalwarrior <varsash@gmail.com> | 2019-10-05 20:32:19 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2019-10-05 20:32:19 +0300 |
| commit | 9f543f9ef7109340142134124e8bda6c9f750a18 (patch) | |
| tree | c4ac0c87baa62575af1c1b7e7d25776c7e3247fc /include | |
| parent | 65332f209c9344e1d3f643ebca32a23dd6f31bdf (diff) | |
I HAVE CONQUERED BASS HELL
BEHOLD, LOOP_START AND LOOP_END MUSIC POINTS! It reads the songname.mp3.txt file, looking for loop_start, loop_length and loop_end in samples
MUSIC EFFECTS SYSTEM THAT CAN ***COMMUNICATE WITH THE SERVER***, WOAHHHHHHHHH!
RIGHT-CLICK CONTEXT MENUS TO ENABLE/DISABLE SPECIFIC MUSIC EFFECTS
MUSIC EFFECTS ENUMS
Fix an issue with music looping
Diffstat (limited to 'include')
| -rw-r--r-- | include/aomusicplayer.h | 2 | ||||
| -rw-r--r-- | include/courtroom.h | 6 | ||||
| -rw-r--r-- | include/datatypes.h | 7 |
3 files changed, 14 insertions, 1 deletions
diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h index 1a91d8f..52c97c3 100644 --- a/include/aomusicplayer.h +++ b/include/aomusicplayer.h @@ -29,7 +29,7 @@ public: 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: 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 |