3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-14 00:31:44 +02:00
Code Issues Projects Releases Packages Wiki Activity

update json.hpp to 3.1.0

Browse source
This commit is contained in:
badaix 2018-02-06 22:38:45 +01:00
parent 84b03c98af
commit 6bbcc83cb1
11 changed files with 17184 additions and 10073 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/snapClient.cpp
View file

@ -87,7 +87,7 @@ int main (int argc, char **argv)
auto versionSwitch = op.add<Switch>("v", "version", "show version number");
#if defined(HAS_ALSA)
auto listSwitch = op.add<Switch>("l", "list", "list pcm devices");
auto soundcardValue = op.add<Value<string>>("s", "soundcard", "index or name of the soundcard", "default", &soundcard);
/*auto soundcardValue =*/ op.add<Value<string>>("s", "soundcard", "index or name of the soundcard", "default", &soundcard);
#endif
auto metaStderr = op.add<Switch>("e", "mstderr", "send metadata to stderr");
//auto metaHook = op.add<Value<string>>("m", "mhook", "script to call on meta tags", "", &meta_script);
@ -198,7 +198,6 @@ int main (int argc, char **argv)
}
#endif
/* TODO: Merge
PcmDevice pcmDevice = getPcmDevice(soundcard);
#if defined(HAS_ALSA)
if (pcmDevice.idx == -1)
@ -207,12 +206,6 @@ int main (int argc, char **argv)
// exit(EXIT_FAILURE);
}
#endif
*/
PcmDevice pcmDevice;
pcmDevice.idx = 1;
if (soundcardValue->is_set())
pcmDevice.name = soundcard;
if (host.empty())
{