changed default sample rate to 48kHz

This commit is contained in:
badaix 2016-01-03 20:43:42 +01:00
parent a7287eeb00
commit bc4f29b9f2
4 changed files with 9 additions and 11 deletions

View file

@ -215,12 +215,12 @@ void StreamServer::onMessageReceived(ControlSession* controlSession, const std::
void StreamServer::onMessageReceived(StreamSession* connection, const msg::BaseMessage& baseMessage, char* buffer)
{
logO << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << ", sent: " << baseMessage.sent.sec << "," << baseMessage.sent.usec << ", recv: " << baseMessage.received.sec << "," << baseMessage.received.usec << "\n";
logD << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << ", sent: " << baseMessage.sent.sec << "," << baseMessage.sent.usec << ", recv: " << baseMessage.received.sec << "," << baseMessage.received.usec << "\n";
if (baseMessage.type == message_type::kRequest)
{
msg::Request requestMsg;
requestMsg.deserialize(baseMessage, buffer);
logO << "request: " << requestMsg.request << "\n";
logD << "request: " << requestMsg.request << "\n";
if (requestMsg.request == kTime)
{
msg::Time timeMsg;
@ -231,7 +231,7 @@ void StreamServer::onMessageReceived(StreamSession* connection, const msg::BaseM
}
else if (requestMsg.request == kServerSettings)
{
logO << "request kServerSettings: " << connection->macAddress << "\n";
logD << "request kServerSettings: " << connection->macAddress << "\n";
std::unique_lock<std::mutex> mlock(mutex_);
ClientInfoPtr clientInfo = Config::instance().getClientInfo(connection->macAddress, true);
if (clientInfo == nullptr)
@ -240,16 +240,14 @@ void StreamServer::onMessageReceived(StreamSession* connection, const msg::BaseM
}
else
{
logO << "request kServerSettings\n";
logD << "request kServerSettings\n";
msg::ServerSettings serverSettings;
serverSettings.volume = clientInfo->volume.percent;
serverSettings.muted = clientInfo->volume.muted;
serverSettings.latency = clientInfo->latency;
serverSettings.refersTo = requestMsg.id;
serverSettings.bufferMs = settings_.bufferMs;
logO << "request kServerSettings\n";
connection->send(&serverSettings);
logO << "request kServerSettings\n";
}
}
else if (requestMsg.request == kSampleFormat)