oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity
2148d4bb31
mpd/src/output/OutputCommand.cxx

114 lines
2.5 KiB
C++
Raw Normal View History

audio: moved code to output_command.c The output_command library provides a command interface to the audio outputs. It assumes the input comes from an untrusted source (i.e. the client) and verifies all parameters.
2009-02-11 18:02:45 +01:00
/*
update copyright year
2017-01-03 20:48:59 +01:00
* Copyright 2003-2017 The Music Player Daemon Project
audio: moved code to output_command.c The output_command library provides a command interface to the audio outputs. It assumes the input comes from an untrusted source (i.e. the client) and verifies all parameters.
2009-02-11 18:02:45 +01:00
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
all: Update copyright header. This updates the copyright header to all be the same, which is pretty much an update of where to mail request for a copy of the GPL and the years of the MPD project. This also puts all committers under 'The Music Player Project' umbrella. These entries should go individually in the AUTHORS file, for consistancy.
2009-03-13 18:43:16 +01:00
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
audio: moved code to output_command.c The output_command library provides a command interface to the audio outputs. It assumes the input comes from an untrusted source (i.e. the client) and verifies all parameters.
2009-02-11 18:02:45 +01:00
*/
/*
* Glue functions for controlling the audio outputs over the MPD
* protocol. These functions perform extra validation on all
* parameters, because they might be from an untrusted source.
*
*/
include config.h in all sources After we've been hit by Large File Support problems several times in the past week (which only occur on 32 bit platforms, which I don't have), this is yet another attempt to fix the issue.
2009-11-12 09:12:38 +01:00
#include "config.h"
output_*: convert to C++
2013-01-04 09:46:41 +01:00
#include "OutputCommand.hxx"
OutputAll: convert to class, move instance to class Partition Another big chunk of code for multi-player support.
2014-01-27 08:20:25 +01:00
#include "MultipleOutputs.hxx"
output/Internal: rename source to Filtered.cxx
2017-08-07 21:50:13 +02:00
#include "Filtered.hxx"
output/Client: new interface to replace direct access to class PlayerControl
2016-12-14 12:14:57 +01:00
#include "Client.hxx"
PlayerThread, ...: move to src/player/
2015-08-15 15:55:46 +02:00
#include "player/Control.hxx"
Mixer*: move to mixer/
2014-01-24 16:25:21 +01:00
#include "mixer/MixerControl.hxx"
output/Command: flush the mixer cache when enabling/disabling output Fixes mixer lag (http://bugs.musicpd.org/view.php?id=4425).
2015-10-26 16:29:07 +01:00
#include "mixer/Volume.hxx"
idle: convert to C++
2013-01-09 08:36:52 +01:00
#include "Idle.hxx"
output_*: convert to C++
2013-01-04 09:46:41 +01:00
state_file: save only if something has changed If nothing has changed since the last save, don't save the state file. Saving will spin up the hard drive, which is undesirable on hosts where MPD is idling in background.
2009-10-08 15:22:39 +02:00
extern unsigned audio_output_state_version;
audio: moved code to output_command.c The output_command library provides a command interface to the audio outputs. It assumes the input comes from an untrusted source (i.e. the client) and verifies all parameters.
2009-02-11 18:02:45 +01:00
bool
OutputAll: convert to class, move instance to class Partition Another big chunk of code for multi-player support.
2014-01-27 08:20:25 +01:00
audio_output_enable_index(MultipleOutputs &outputs, unsigned idx)
audio: moved code to output_command.c The output_command library provides a command interface to the audio outputs. It assumes the input comes from an untrusted source (i.e. the client) and verifies all parameters.
2009-02-11 18:02:45 +01:00
{
OutputAll: convert to class, move instance to class Partition Another big chunk of code for multi-player support.
2014-01-27 08:20:25 +01:00
if (idx >= outputs.Size())
audio: moved code to output_command.c The output_command library provides a command interface to the audio outputs. It assumes the input comes from an untrusted source (i.e. the client) and verifies all parameters.
2009-02-11 18:02:45 +01:00
return false;
output/Control: add struct AudioOutputControl Will move attributes from struct AudioOutput that are specific to the OutputThread. The new struct AudioOutputControl is a holder for the AudioOutput pointer. This prepares for making the output list more dynamic, to allow moving outputs to between partitions.
2017-02-27 22:55:20 +01:00
auto &ao = outputs.Get(idx);
if (!ao.LockSetEnabled(true))
output_plugin: added methods enable() and disable() With these methods, an output plugin can allocate some global resources only if it is actually enabled. The method enable() is called after daemonization, which allows for more sophisticated resource allocation during that method.
2009-10-23 10:55:52 +02:00
return true;
audio: moved code to output_command.c The output_command library provides a command interface to the audio outputs. It assumes the input comes from an untrusted source (i.e. the client) and verifies all parameters.
2009-02-11 18:02:45 +01:00
idle_add(IDLE_OUTPUT);
output/Control: add struct AudioOutputControl Will move attributes from struct AudioOutput that are specific to the OutputThread. The new struct AudioOutputControl is a holder for the AudioOutput pointer. This prepares for making the output list more dynamic, to allow moving outputs to between partitions.
2017-02-27 22:55:20 +01:00
if (ao.GetMixer() != nullptr) {
output/Command: flush the mixer cache when enabling/disabling output Fixes mixer lag (http://bugs.musicpd.org/view.php?id=4425).
2015-10-26 16:29:07 +01:00
InvalidateHardwareVolume();
idle_add(IDLE_MIXER);
}
output/Control: add struct AudioOutputControl Will move attributes from struct AudioOutput that are specific to the OutputThread. The new struct AudioOutputControl is a holder for the AudioOutput pointer. This prepares for making the output list more dynamic, to allow moving outputs to between partitions.
2017-02-27 22:55:20 +01:00
ao.GetClient().ApplyEnabled();
output_plugin: added methods enable() and disable() With these methods, an output plugin can allocate some global resources only if it is actually enabled. The method enable() is called after daemonization, which allows for more sophisticated resource allocation during that method.
2009-10-23 10:55:52 +02:00
state_file: save only if something has changed If nothing has changed since the last save, don't save the state file. Saving will spin up the hard drive, which is undesirable on hosts where MPD is idling in background.
2009-10-08 15:22:39 +02:00
++audio_output_state_version;
audio: moved code to output_command.c The output_command library provides a command interface to the audio outputs. It assumes the input comes from an untrusted source (i.e. the client) and verifies all parameters.
2009-02-11 18:02:45 +01:00
return true;
}
bool
OutputAll: convert to class, move instance to class Partition Another big chunk of code for multi-player support.
2014-01-27 08:20:25 +01:00
audio_output_disable_index(MultipleOutputs &outputs, unsigned idx)
audio: moved code to output_command.c The output_command library provides a command interface to the audio outputs. It assumes the input comes from an untrusted source (i.e. the client) and verifies all parameters.
2009-02-11 18:02:45 +01:00
{
OutputAll: convert to class, move instance to class Partition Another big chunk of code for multi-player support.
2014-01-27 08:20:25 +01:00
if (idx >= outputs.Size())
audio: moved code to output_command.c The output_command library provides a command interface to the audio outputs. It assumes the input comes from an untrusted source (i.e. the client) and verifies all parameters.
2009-02-11 18:02:45 +01:00
return false;
output/Control: add struct AudioOutputControl Will move attributes from struct AudioOutput that are specific to the OutputThread. The new struct AudioOutputControl is a holder for the AudioOutput pointer. This prepares for making the output list more dynamic, to allow moving outputs to between partitions.
2017-02-27 22:55:20 +01:00
auto &ao = outputs.Get(idx);
if (!ao.LockSetEnabled(false))
output_plugin: added methods enable() and disable() With these methods, an output plugin can allocate some global resources only if it is actually enabled. The method enable() is called after daemonization, which allows for more sophisticated resource allocation during that method.
2009-10-23 10:55:52 +02:00
return true;
audio: moved code to output_command.c The output_command library provides a command interface to the audio outputs. It assumes the input comes from an untrusted source (i.e. the client) and verifies all parameters.
2009-02-11 18:02:45 +01:00
idle_add(IDLE_OUTPUT);
output/Control: add struct AudioOutputControl Will move attributes from struct AudioOutput that are specific to the OutputThread. The new struct AudioOutputControl is a holder for the AudioOutput pointer. This prepares for making the output list more dynamic, to allow moving outputs to between partitions.
2017-02-27 22:55:20 +01:00
auto *mixer = ao.GetMixer();
*: use nullptr instead of NULL
2013-10-19 18:19:03 +02:00
if (mixer != nullptr) {
mixer_control: don't touch mixers of disabled outputs When an audio output device is disabled, also disable its mixer.
2009-03-12 18:40:03 +01:00
mixer_close(mixer);
output/Command: flush the mixer cache when enabling/disabling output Fixes mixer lag (http://bugs.musicpd.org/view.php?id=4425).
2015-10-26 16:29:07 +01:00
InvalidateHardwareVolume();
mixer_control: don't touch mixers of disabled outputs When an audio output device is disabled, also disable its mixer.
2009-03-12 18:40:03 +01:00
idle_add(IDLE_MIXER);
}
output/Control: add struct AudioOutputControl Will move attributes from struct AudioOutput that are specific to the OutputThread. The new struct AudioOutputControl is a holder for the AudioOutput pointer. This prepares for making the output list more dynamic, to allow moving outputs to between partitions.
2017-02-27 22:55:20 +01:00
ao.GetClient().ApplyEnabled();
output_plugin: added methods enable() and disable() With these methods, an output plugin can allocate some global resources only if it is actually enabled. The method enable() is called after daemonization, which allows for more sophisticated resource allocation during that method.
2009-10-23 10:55:52 +02:00
state_file: save only if something has changed If nothing has changed since the last save, don't save the state file. Saving will spin up the hard drive, which is undesirable on hosts where MPD is idling in background.
2009-10-08 15:22:39 +02:00
++audio_output_state_version;
audio: moved code to output_command.c The output_command library provides a command interface to the audio outputs. It assumes the input comes from an untrusted source (i.e. the client) and verifies all parameters.
2009-02-11 18:02:45 +01:00
return true;
}
Commands: new command "toggleoutput"
2013-08-04 23:20:56 +02:00
bool
OutputAll: convert to class, move instance to class Partition Another big chunk of code for multi-player support.
2014-01-27 08:20:25 +01:00
audio_output_toggle_index(MultipleOutputs &outputs, unsigned idx)
Commands: new command "toggleoutput"
2013-08-04 23:20:56 +02:00
{
OutputAll: convert to class, move instance to class Partition Another big chunk of code for multi-player support.
2014-01-27 08:20:25 +01:00
if (idx >= outputs.Size())
Commands: new command "toggleoutput"
2013-08-04 23:20:56 +02:00
return false;
output/Control: add struct AudioOutputControl Will move attributes from struct AudioOutput that are specific to the OutputThread. The new struct AudioOutputControl is a holder for the AudioOutput pointer. This prepares for making the output list more dynamic, to allow moving outputs to between partitions.
2017-02-27 22:55:20 +01:00
auto &ao = outputs.Get(idx);
const bool enabled = ao.LockToggleEnabled();
Commands: new command "toggleoutput"
2013-08-04 23:20:56 +02:00
idle_add(IDLE_OUTPUT);
if (!enabled) {
output/Control: add struct AudioOutputControl Will move attributes from struct AudioOutput that are specific to the OutputThread. The new struct AudioOutputControl is a holder for the AudioOutput pointer. This prepares for making the output list more dynamic, to allow moving outputs to between partitions.
2017-02-27 22:55:20 +01:00
auto *mixer = ao.GetMixer();
Commands: new command "toggleoutput"
2013-08-04 23:20:56 +02:00
if (mixer != nullptr) {
mixer_close(mixer);
output/Command: flush the mixer cache when enabling/disabling output Fixes mixer lag (http://bugs.musicpd.org/view.php?id=4425).
2015-10-26 16:29:07 +01:00
InvalidateHardwareVolume();
Commands: new command "toggleoutput"
2013-08-04 23:20:56 +02:00
idle_add(IDLE_MIXER);
}
}
output/Control: add struct AudioOutputControl Will move attributes from struct AudioOutput that are specific to the OutputThread. The new struct AudioOutputControl is a holder for the AudioOutput pointer. This prepares for making the output list more dynamic, to allow moving outputs to between partitions.
2017-02-27 22:55:20 +01:00
ao.GetClient().ApplyEnabled();
Commands: new command "toggleoutput"
2013-08-04 23:20:56 +02:00
++audio_output_state_version;
return true;
}
Reference in New Issue Copy Permalink