diff --git a/src/common/network/rest/http/ClientConnection.h b/src/common/network/rest/http/ClientConnection.h index 7c4f4ff3..6b2e86dd 100644 --- a/src/common/network/rest/http/ClientConnection.h +++ b/src/common/network/rest/http/ClientConnection.h @@ -229,7 +229,7 @@ namespace network std::size_t m_bytesTransferred; std::array m_fullBuffer; - std::array m_buffer; + std::array m_buffer; HTTPPayload m_request; HTTPLexer m_lexer; diff --git a/src/common/network/rest/http/SecureClientConnection.h b/src/common/network/rest/http/SecureClientConnection.h index 7083254c..7611e97f 100644 --- a/src/common/network/rest/http/SecureClientConnection.h +++ b/src/common/network/rest/http/SecureClientConnection.h @@ -252,7 +252,7 @@ namespace network std::size_t m_bytesTransferred; std::array m_fullBuffer; - std::array m_buffer; + std::array m_buffer; HTTPPayload m_request; HTTPLexer m_lexer; diff --git a/src/sysview/AffListWnd.h b/src/sysview/AffListWnd.h index b83e13ba..b860b82e 100644 --- a/src/sysview/AffListWnd.h +++ b/src/sysview/AffListWnd.h @@ -28,7 +28,7 @@ using namespace finalcut; // Constants // --------------------------------------------------------------------------- -#define AFF_LIST_WIDTH 74 +#define AFF_LIST_WIDTH 64 #define AFF_LIST_HEIGHT 15 // --------------------------------------------------------------------------- diff --git a/src/sysview/PeerListWnd.h b/src/sysview/PeerListWnd.h index 87bb6ae8..fb969449 100644 --- a/src/sysview/PeerListWnd.h +++ b/src/sysview/PeerListWnd.h @@ -147,6 +147,14 @@ public: voiceChannelPeers.push_back(vcPeerId); } + json::object peerConfig = peerObj["config"].get(); + std::string identity = peerConfig["identity"].get(); + std::string software = peerConfig["software"].get(); + + json::object channel = peerConfig["channel"].get(); + uint32_t chNo = (uint32_t)channel["channelNo"].get(); + uint8_t chId = channel["channelId"].get(); + // pad peer IDs properly std::ostringstream peerOss; peerOss << std::setw(9) << std::setfill('0') << peerId; @@ -156,14 +164,16 @@ public: ccPeerOss << std::setw(9) << std::setfill('0') << ccPeerId; // build list view entry - const std::array columns = { + const std::array columns = { peerOss.str(), + identity, software, peerAddress, std::to_string(port), ccPeerOss.str(), (voiceChannelPeers.size() > 0U) ? "X" : "", (connected) ? "X" : "", strConnState, - std::to_string(pingsReceived) + std::to_string(pingsReceived), + std::to_string(chId), std::to_string(chNo) }; const finalcut::FStringList line(columns.cbegin(), columns.cend()); @@ -218,6 +228,8 @@ private: // configure list view columns m_listView.addColumn("Peer ID", 10); + m_listView.addColumn("Identity", 10); + m_listView.addColumn("Software", 15); m_listView.addColumn("IP Address", 15); m_listView.addColumn("Port", 8); m_listView.addColumn("CC Peer ID", 10); @@ -225,6 +237,8 @@ private: m_listView.addColumn("Connected", 5); m_listView.addColumn("State", 15); m_listView.addColumn("Pings Received", 8); + m_listView.addColumn("Ch. ID", 8); + m_listView.addColumn("Ch. No", 8); // set right alignment for TGID m_listView.setColumnAlignment(1, finalcut::Align::Right);