Remove StreamTags message

badaix · Jan 31, 2023 · a3cd985 · a3cd985
1 parent 97e84f3
commit a3cd985
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 115 deletions.
diff --git a/client/controller.cpp b/client/controller.cpp
@@ -259,14 +259,6 @@ void Controller::getNextMessage()
             player_->setVolume(serverSettings_->getVolume() / 100., serverSettings_->isMuted());
             // }
         }
-        // else if (response->type == message_type::kStreamTags)
-        // {
-        //     if (meta_)
-        //     {
-        //         auto stream_tags = msg::message_cast<msg::StreamTags>(std::move(response));
-        //         meta_->push(stream_tags->msg);
-        //     }
-        // }
         else
         {
             LOG(WARNING, LOG_TAG) << "Unexpected message received, type: " << response->type << "\n";

diff --git a/common/message/factory.hpp b/common/message/factory.hpp
@@ -1,6 +1,6 @@
 /***
     This file is part of snapcast
-    Copyright (C) 2014-2022  Johannes Pohl
+    Copyright (C) 2014-2023  Johannes Pohl
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -75,8 +75,6 @@ static std::unique_ptr<BaseMessage> createMessage(const BaseMessage& base_messag
             return createMessage<Hello>(base_message, buffer);
         case message_type::kServerSettings:
             return createMessage<ServerSettings>(base_message, buffer);
-        // case message_type::kStreamTags:
-        //     return createMessage<StreamTags>(base_message, buffer);
         case message_type::kTime:
             return createMessage<Time>(base_message, buffer);
         case message_type::kWireChunk:

diff --git a/common/message/message.hpp b/common/message/message.hpp
@@ -1,6 +1,6 @@
 /***
     This file is part of snapcast
-    Copyright (C) 2014-2022  Johannes Pohl
+    Copyright (C) 2014-2023  Johannes Pohl
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@ enum class message_type : uint16_t
     kServerSettings = 3,
     kTime = 4,
     kHello = 5,
-    kStreamTags = 6,
+    // kStreamTags = 6,
     kClientInfo = 7,
 
     kFirst = kBase,
@@ -92,9 +92,6 @@ static std::ostream& operator<<(std::ostream& os, const message_type& msg_type)
         case message_type::kHello:
             os << "Hello";
             break;
-        case message_type::kStreamTags:
-            os << "StreamTags";
-            break;
         case message_type::kClientInfo:
             os << "ClientInfo";
             break;

diff --git a/common/message/stream_tags.hpp b/common/message/stream_tags.hpp
diff --git a/doc/binary_protocol.md b/doc/binary_protocol.md
@@ -13,7 +13,6 @@ When a client joins a server, the following exchanges happen
 1. Client opens a TCP socket to the server (default port is 1704)
 1. Client sends a [Hello](#hello) message
 1. Server sends a [Server Settings](#server-settings) message
-1. Server sends a [Stream Tags](#stream-tags) message
 1. Server sends a [Codec Header](#codec-header) message
     1. Until the server sends this, the client shouldn't play any [Wire Chunk](#wire-chunk) messages
 1. The server will now send [Wire Chunk](#wire-chunk) messages, which can be fed to the audio decoder.
@@ -123,20 +122,3 @@ Sample JSON payload (whitespace added for readability):
     "Version": "0.17.1"
 }
 ```
-
-### Stream Tags
-
-| Field   | Type   | Description                                                    |
-|---------|--------|----------------------------------------------------------------|
-| size    | uint32 | Size of the following JSON string                              |
-| payload | char[] | JSON string containing the message (not null terminated)       |
-
-Sample JSON payload (whitespace added for readability):
-
-```json
-{
-    "STREAM": "default"
-}
-```
-
-[According to the source](https://github.com/badaix/snapcast/blob/master/common/message/stream_tags.hpp#L55-L56), these tags can vary based on the stream.
diff --git a/server/stream_server.hpp b/server/stream_server.hpp
@@ -70,7 +70,6 @@ class StreamServer : public StreamMessageReceiver
     //	void send(const msg::BaseMessage* message);
 
     void addSession(std::shared_ptr<StreamSession> session);
-    // void onMetadataChanged(const PcmStream* pcmStream, std::shared_ptr<msg::StreamTags> meta);
     void onChunkEncoded(const PcmStream* pcmStream, bool isDefaultStream, std::shared_ptr<msg::PcmChunk> chunk, double duration);
 
     session_ptr getStreamSession(const std::string& clientId) const;