oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/osx: make several fields `const`

This commit is contained in:
Max Kellermann 2020-05-28 13:30:52 +02:00
parent 44cfdff39a
commit 5c7243d3ad
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/output/plugins/OSXOutputPlugin.cxx
View File

@ -66,8 +66,8 @@ struct OSXOutput final : AudioOutput {
OSType component_subtype; OSType component_subtype;
/* only applicable with kAudioUnitSubType_HALOutput */ /* only applicable with kAudioUnitSubType_HALOutput */
const char *device_name; const char *device_name;
const char *channel_map; const char *const channel_map;
bool hog_device; const bool hog_device;
bool pause; bool pause;
#ifdef ENABLE_DSD #ifdef ENABLE_DSD
/** /**
@ -75,7 +75,7 @@ struct OSXOutput final : AudioOutput {
* *
* @see http://dsd-guide.com/dop-open-standard * @see http://dsd-guide.com/dop-open-standard
*/ */
bool dop_setting; const bool dop_setting;
bool dop_enabled; bool dop_enabled;
Manual<PcmExport> pcm_export; Manual<PcmExport> pcm_export;
#endif #endif
@ -131,7 +131,12 @@ osx_output_test_default_device()
} }
OSXOutput::OSXOutput(const ConfigBlock &block) OSXOutput::OSXOutput(const ConfigBlock &block)
:AudioOutput(FLAG_ENABLE_DISABLE|FLAG_PAUSE) :AudioOutput(FLAG_ENABLE_DISABLE|FLAG_PAUSE),
channel_map(block.GetBlockValue("channel_map")),
hog_device(block.GetBlockValue("hog_device", false))
#ifdef ENABLE_DSD
, dop_setting(block.GetBlockValue("dop", false))
#endif
{ {
const char *device = block.GetBlockValue("device"); const char *device = block.GetBlockValue("device");
@ -148,12 +153,6 @@ OSXOutput::OSXOutput(const ConfigBlock &block)
/* XXX am I supposed to strdup() this? */ /* XXX am I supposed to strdup() this? */
device_name = device; device_name = device;
} }
channel_map = block.GetBlockValue("channel_map");
hog_device = block.GetBlockValue("hog_device", false);
#ifdef ENABLE_DSD
dop_setting = block.GetBlockValue("dop", false);
#endif
} }
AudioOutput * AudioOutput *