완성(준)

src/Audio/MusicPlayManager.cpp

@@ -1,23 +1,97 @@
 #include <Audio/MusicPlayManager.hpp>
 #include <ogg/ogg.h>
 #include <oggz/oggz.h>
+#include <algorithm>
 
 namespace bumbleBee {
 
 void MusicPlayManager::on_voice_ready(const dpp::voice_ready_t& event) {
-    std::unique_lock<std::mutex> queueEmptyLock(queueEmptyMutex);
-    queuedCondition.wait(queueEmptyLock, [&]{
-        return queue->queue.size() != 0;
-    });
+    play(event.voice_client);
+}
 
-    auto np = queue->nowplaying();
-    auto music = *np;
-    
+void MusicPlayManager::on_voice_track_marker(const dpp::voice_track_marker_t& event) {
+    play(event.voice_client);
+}
+
+void MusicPlayManager::on_voice_client_disconnect(const dpp::voice_client_disconnect_t& event) { // 안 불리는 듯?
+    dpp::snowflake gid = dpp::find_channel(event.voice_client->channel_id)->guild_id;
+    event.voice_client->stop_audio();
+    queueMap[gid]->clear();
+}
+
+void MusicPlayManager::play(dpp::discord_voice_client* client) {
+    std::thread t([&](dpp::discord_voice_client* client){
+        dpp::snowflake gid = dpp::find_channel(client->channel_id)->guild_id;
+
+        std::unique_lock<std::mutex> queueEmptyLock(*queueEmptyMutex[gid]);
+        queuedCondition.wait(queueEmptyLock, [&]{ return queueMap[gid]->size() != 0; });
+
+        auto np = queueMap[gid]->next_music();
+        auto music = **np;
+        send_audio_to_voice(music, client);
+    }, client);
+    t.detach();
+}
+
+void MusicPlayManager::queue_music(const dpp::snowflake guildId, const std::shared_ptr<MusicQueueElement> music) {
+    queueMap[guildId]->enqueue(music);
+}
+
+void MusicPlayManager::clear(const dpp::snowflake guildId) {
+    queueMap[guildId]->clear();
+}
+std::shared_ptr<MusicQueueElement> MusicPlayManager::remove(const dpp::snowflake guildId, dpp::discord_voice_client* client, int index) {
+    auto queue = queueMap[guildId];
+    auto foundIterator = queue->findByIndex(index);
+
+    if (queue->currentPlayingPosition == foundIterator) {
+        auto removed = queue->erase(queue->findByIndex(0));
+        if (client == nullptr)
+            return removed;
+        client->pause_audio(true);
+        client->stop_audio();
+        client->pause_audio(false);
+        client->insert_marker("end");
+        return removed;
+    }
+
+    return queue->erase(queue->findByIndex(index));
+}
+int MusicPlayManager::size(const dpp::snowflake guildId) {
+    return queueMap[guildId]->size();
+}
+void MusicPlayManager::setRepeat(const dpp::snowflake guildId, const bool value) {
+    queueMap[guildId]->repeat = value;
+}
+
+bool MusicPlayManager::getRepeat(const dpp::snowflake guildId) {
+    return queueMap[guildId]->repeat;
+}
+
+std::list<MusicQueueElement> MusicPlayManager::getQueue(const dpp::snowflake guildId){
+    std::list<std::shared_ptr<MusicQueueElement>> queue = queueMap[guildId]->getQueueCopy();
+    std::list<MusicQueueElement> returnValue;
+
+    for (auto iter = queue.begin(); iter != queue.end(); iter++)
+        returnValue.push_back(**iter);
+
+    return returnValue;
+}
+
+MusicQueueElement MusicPlayManager::getNowPlaying(const dpp::snowflake guildId) {
+    std::shared_ptr<MusicQueueElement> nowplaying = queueMap[guildId]->nowplaying();
+    MusicQueueElement returnValue(*nowplaying);
+    return returnValue;
+}
+
+void MusicPlayManager::send_audio_to_voice(const MusicQueueElement& music, dpp::discord_voice_client* client) {
     std::string command = "./streamOpus.sh ./yt-dlp ffmpeg https://youtu.be/";
     command += music.id;
 
     OGGZ* og = oggz_open_stdio(popen(command.c_str(), "r"), OGGZ_READ);
 
+    client->stop_audio();
+
     oggz_set_read_callback(
         og, -1,
         [](OGGZ *oggz, oggz_packet *packet, long serialno, void *user_data) {
@@ -27,10 +101,10 @@ void MusicPlayManager::on_voice_ready(const dpp::voice_ready_t& event) {
 
             return 0;
         },
-        (void *)event.voice_client
+        (void *)client
     );
 
-    while (event.voice_client && !event.voice_client->terminating) {
+    while (client && !client->terminating) {
         static const constexpr long CHUNK_READ = BUFSIZ * 2;
 
         const long read_bytes = oggz_read(og, CHUNK_READ);
@@ -41,28 +115,11 @@ void MusicPlayManager::on_voice_ready(const dpp::voice_ready_t& event) {
         }
     }
 
-    //event.from->creator->log(dpp::ll_info, std::string("Sending ") + music.id + " complete!");
+    client->creator->log(dpp::ll_info, "Sending " + music.id + " complete!");
+
     oggz_close(og);
 
-    event.voice_client->insert_marker("end");
-
-    queueEmptyLock.unlock();
-}
-
-void MusicPlayManager::on_voice_track_marker(const dpp::voice_track_marker_t& event) {
-    queue->next_music();
-}
-
-void MusicPlayManager::on_voice_client_disconnect(const dpp::voice_client_disconnect_t& event) {
-    event.voice_client->stop_audio();
-}
-
-void MusicPlayManager::queue_music(const std::shared_ptr<MusicQueueElement> music) {
-    queue->enqueue(music);
-}
-
-void MusicPlayManager::send_audio_to_voice(const MusicQueueElement& music, const dpp::voice_ready_t &event) {
-    
+    client->insert_marker();
 }
 }