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

output/roar: remove

Browse Source 
Bugs in libroar which broke the MPD build have been annoying me for
quite some time, and the newest bug has now hit my main build machine:

 https://github.com/MusicPlayerDaemon/MPD/issues/377

Problem is the usage of the typedef `_IO_off64_t` in libroar's
`vio_stdio.h`:

 int roar_vio_to_stdio_lseek (void *__cookie, _IO_off64_t *__pos, int __w);

This `_IO_off64_t` is an internal implementation detail of glibc and
was removed in version 2.28.  Nobody must ever use it.  Why the ****
did the RoarAudio developers use it?  Not using internal typedefs
isn't exactly rocket science.

This annoys me enough to finally remove the plugin.  Anyway, I've
never heard of anybody using RoarAudio, so my best guess is that
nobody will notice.
This commit is contained in:
Max Kellermann
2018-10-31 15:03:28 +01:00
parent 9fc00a817b
commit 06ca08ce55
13 changed files with 2 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mixer/MixerList.hxx
View File

@@ -33,7 +33,6 @@ extern const MixerPlugin alsa_mixer_plugin;
extern const MixerPlugin haiku_mixer_plugin;
extern const MixerPlugin oss_mixer_plugin;
extern const MixerPlugin osx_mixer_plugin;
extern const MixerPlugin roar_mixer_plugin;
extern const MixerPlugin pulse_mixer_plugin;
extern const MixerPlugin winmm_mixer_plugin;
extern const MixerPlugin sndio_mixer_plugin;

70
src/mixer/plugins/RoarMixerPlugin.cxx
View File

@@ -1,70 +0,0 @@
/*
* Copyright 2003-2017 The Music Player Daemon Project
* Copyright (C) 2010-2011 Philipp 'ph3-der-loewe' Schafft
* Copyright (C) 2010-2011 Hans-Kristian 'maister' Arntzen
*
* 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.
*
* 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.
*/
#include "config.h"
#include "mixer/MixerInternal.hxx"
#include "output/plugins/RoarOutputPlugin.hxx"
#include "util/Compiler.h"
class RoarMixer final : public Mixer {
/** the base mixer class */
RoarOutput &self;
public:
RoarMixer(RoarOutput &_output, MixerListener &_listener)
:Mixer(roar_mixer_plugin, _listener),
self(_output) {}
/* virtual methods from class Mixer */
void Open() override {
}
void Close() noexcept override {
}
int GetVolume() override;
void SetVolume(unsigned volume) override;
};
static Mixer *
roar_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao,
MixerListener &listener,
gcc_unused const ConfigBlock &block)
{
return new RoarMixer((RoarOutput &)ao, listener);
}
int
RoarMixer::GetVolume()
{
return roar_output_get_volume(self);
}
void
RoarMixer::SetVolume(unsigned volume)
{
roar_output_set_volume(self, volume);
}
const MixerPlugin roar_mixer_plugin = {
roar_mixer_init,
false,
};

5
src/mixer/plugins/meson.build
View File

@@ -26,10 +26,6 @@ if pulse_dep.found()
mixer_plugins_sources += 'PulseMixerPlugin.cxx'
endif
if libroar_dep.found()
mixer_plugins_sources += 'RoarMixerPlugin.cxx'
endif
if libsndio_dep.found()
mixer_plugins_sources += 'SndioMixerPlugin.cxx'
endif
@@ -45,7 +41,6 @@ mixer_plugins = static_library(
dependencies: [
alsa_dep,
pulse_dep,
libroar_dep,
libsndio_dep,
]
)