3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-11 16:16:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

parse sample format in Android

Browse source
This commit is contained in:
badaix 2017-10-04 23:13:47 +02:00
parent f0a71a9e94
commit baf5a7af3b
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
android/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java
View file

@ -352,7 +352,7 @@ public class MainActivity extends AppCompatActivity implements GroupItem.GroupIt
@Override @Override
public void onLog(SnapclientService snapclientService, String timestamp, String logClass, String msg) { public void onLog(SnapclientService snapclientService, String timestamp, String logClass, String msg) {
Log.d(TAG, "[" + logClass + "] " + msg); Log.d(TAG, "[" + logClass + "] " + msg);
if ("state".equals(logClass)) { if ("Notice".equals(logClass)) {
if (msg.startsWith("sampleformat")) { if (msg.startsWith("sampleformat")) {
msg = msg.substring(msg.indexOf(":") + 2); msg = msg.substring(msg.indexOf(":") + 2);
Log.d(TAG, "sampleformat: " + msg); Log.d(TAG, "sampleformat: " + msg);

3
client/controller.cpp
View file

@ -115,8 +115,7 @@ void Controller::onMessageReceived(ClientConnection* connection, const msg::Base
throw SnapException("codec not supported: \"" + headerChunk_->codec + "\""); throw SnapException("codec not supported: \"" + headerChunk_->codec + "\"");
sampleFormat_ = decoder_->setHeader(headerChunk_.get()); sampleFormat_ = decoder_->setHeader(headerChunk_.get());
/// TODO: read in Android client LOG(NOTICE) << TAG("state") << "sampleformat: " << sampleFormat_.rate << ":" << sampleFormat_.bits << ":" << sampleFormat_.channels << "\n";
LOG(INFO) << TAG("state") << "sampleformat: " << sampleFormat_.rate << ":" << sampleFormat_.bits << ":" << sampleFormat_.channels << "\n";
stream_ = make_shared<Stream>(sampleFormat_); stream_ = make_shared<Stream>(sampleFormat_);
stream_->setBufferLen(serverSettings_->getBufferMs() - latency_); stream_->setBufferLen(serverSettings_->getBufferMs() - latency_);