refix issue with REST client (I shrunk a buffer for testing and didn't re-enbigen it); enhance some sysview displays slightly;

pull/72/head
Bryan Biedenkapp 1 year ago
parent fe6f7508c0
commit cd56011f87

@ -229,7 +229,7 @@ namespace network
std::size_t m_bytesTransferred; std::size_t m_bytesTransferred;
std::array<char, 65535> m_fullBuffer; std::array<char, 65535> m_fullBuffer;
std::array<char, 1024> m_buffer; std::array<char, 4096> m_buffer;
HTTPPayload m_request; HTTPPayload m_request;
HTTPLexer m_lexer; HTTPLexer m_lexer;

@ -252,7 +252,7 @@ namespace network
std::size_t m_bytesTransferred; std::size_t m_bytesTransferred;
std::array<char, 65535> m_fullBuffer; std::array<char, 65535> m_fullBuffer;
std::array<char, 1024> m_buffer; std::array<char, 4096> m_buffer;
HTTPPayload m_request; HTTPPayload m_request;
HTTPLexer m_lexer; HTTPLexer m_lexer;

@ -28,7 +28,7 @@ using namespace finalcut;
// Constants // Constants
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#define AFF_LIST_WIDTH 74 #define AFF_LIST_WIDTH 64
#define AFF_LIST_HEIGHT 15 #define AFF_LIST_HEIGHT 15
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------

@ -147,6 +147,14 @@ public:
voiceChannelPeers.push_back(vcPeerId); voiceChannelPeers.push_back(vcPeerId);
} }
json::object peerConfig = peerObj["config"].get<json::object>();
std::string identity = peerConfig["identity"].get<std::string>();
std::string software = peerConfig["software"].get<std::string>();
json::object channel = peerConfig["channel"].get<json::object>();
uint32_t chNo = (uint32_t)channel["channelNo"].get<int>();
uint8_t chId = channel["channelId"].get<uint8_t>();
// pad peer IDs properly // pad peer IDs properly
std::ostringstream peerOss; std::ostringstream peerOss;
peerOss << std::setw(9) << std::setfill('0') << peerId; peerOss << std::setw(9) << std::setfill('0') << peerId;
@ -156,14 +164,16 @@ public:
ccPeerOss << std::setw(9) << std::setfill('0') << ccPeerId; ccPeerOss << std::setw(9) << std::setfill('0') << ccPeerId;
// build list view entry // build list view entry
const std::array<std::string, 8U> columns = { const std::array<std::string, 12U> columns = {
peerOss.str(), peerOss.str(),
identity, software,
peerAddress, std::to_string(port), peerAddress, std::to_string(port),
ccPeerOss.str(), ccPeerOss.str(),
(voiceChannelPeers.size() > 0U) ? "X" : "", (voiceChannelPeers.size() > 0U) ? "X" : "",
(connected) ? "X" : "", (connected) ? "X" : "",
strConnState, 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()); const finalcut::FStringList line(columns.cbegin(), columns.cend());
@ -218,6 +228,8 @@ private:
// configure list view columns // configure list view columns
m_listView.addColumn("Peer ID", 10); 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("IP Address", 15);
m_listView.addColumn("Port", 8); m_listView.addColumn("Port", 8);
m_listView.addColumn("CC Peer ID", 10); m_listView.addColumn("CC Peer ID", 10);
@ -225,6 +237,8 @@ private:
m_listView.addColumn("Connected", 5); m_listView.addColumn("Connected", 5);
m_listView.addColumn("State", 15); m_listView.addColumn("State", 15);
m_listView.addColumn("Pings Received", 8); m_listView.addColumn("Pings Received", 8);
m_listView.addColumn("Ch. ID", 8);
m_listView.addColumn("Ch. No", 8);
// set right alignment for TGID // set right alignment for TGID
m_listView.setColumnAlignment(1, finalcut::Align::Right); m_listView.setColumnAlignment(1, finalcut::Align::Right);

Loading…
Cancel
Save

Powered by TurnKey Linux.