17c79a9e23
Besides adapting the components to the use of base/log.h, the patch cleans up a few base headers, i.e., it removes unused includes from root/component.h, specifically base/heap.h and ram_session/ram_session.h. Hence, components that relied on the implicit inclusion of those headers have to manually include those headers now. While adjusting the log messages, I repeatedly stumbled over the problem that printing char * arguments is ambiguous. It is unclear whether to print the argument as pointer or null-terminated string. To overcome this problem, the patch introduces a new type 'Cstring' that allows the caller to express that the argument should be handled as null-terminated string. As a nice side effect, with this type in place, the optional len argument of the 'String' class could be removed. Instead of supplying a pair of (char const *, size_t), the constructor accepts a 'Cstring'. This, in turn, clears the way let the 'String' constructor use the new output mechanism to assemble a string from multiple arguments (and thereby getting rid of snprintf within Genode in the near future). To enforce the explicit resolution of the char * ambiguity, the 'char *' overload of the 'print' function is marked as deleted. Issue #1987
152 lines
3.2 KiB
C++
152 lines
3.2 KiB
C++
/*
|
|
* \brief Client-side Audio_out-session
|
|
* \author Sebastian Sumpf
|
|
* \date 2012-12-20
|
|
*/
|
|
|
|
/*
|
|
* Copyright (C) 2012-2013 Genode Labs GmbH
|
|
*
|
|
* This file is part of the Genode OS framework, which is distributed
|
|
* under the terms of the GNU General Public License version 2.
|
|
*/
|
|
|
|
#ifndef _INCLUDE__AUDIO_OUT_SESSION__CLIENT_H_
|
|
#define _INCLUDE__AUDIO_OUT_SESSION__CLIENT_H_
|
|
|
|
#include <base/env.h>
|
|
#include <base/rpc_client.h>
|
|
#include <audio_out_session/audio_out_session.h>
|
|
|
|
namespace Audio_out {
|
|
struct Signal;
|
|
struct Session_client;
|
|
}
|
|
|
|
|
|
struct Audio_out::Signal
|
|
{
|
|
Genode::Signal_receiver recv;
|
|
Genode::Signal_context context;
|
|
Genode::Signal_context_capability cap;
|
|
|
|
Signal() : cap(recv.manage(&context)) { }
|
|
|
|
void wait() { recv.wait_for_signal(); }
|
|
};
|
|
|
|
|
|
class Audio_out::Session_client : public Genode::Rpc_client<Session>
|
|
{
|
|
private:
|
|
|
|
Signal _progress;
|
|
Signal _alloc;
|
|
|
|
Genode::Signal_transmitter _data_avail;
|
|
|
|
public:
|
|
|
|
/**
|
|
* Constructor
|
|
*
|
|
* \param session session capability
|
|
* \param alloc_signal true, install 'alloc_signal' receiver
|
|
* \param progress_signal true, install 'progress_signal' receiver
|
|
*/
|
|
Session_client(Genode::Capability<Session> session, bool alloc_signal,
|
|
bool progress_signal)
|
|
:
|
|
Genode::Rpc_client<Session>(session),
|
|
_data_avail(call<Rpc_data_avail_sigh>())
|
|
{
|
|
/* ask server for stream data space and attach it */
|
|
_stream = static_cast<Stream *>(Genode::env()->rm_session()->attach(call<Rpc_dataspace>()));
|
|
|
|
if (progress_signal)
|
|
progress_sigh(_progress.cap);
|
|
|
|
if (alloc_signal)
|
|
alloc_sigh(_alloc.cap);
|
|
}
|
|
|
|
|
|
/*************
|
|
** Signals **
|
|
*************/
|
|
|
|
void progress_sigh(Genode::Signal_context_capability sigh) {
|
|
call<Rpc_progress_sigh>(sigh); }
|
|
|
|
void alloc_sigh(Genode::Signal_context_capability sigh) {
|
|
call<Rpc_alloc_sigh>(sigh); }
|
|
|
|
Genode::Signal_context_capability data_avail_sigh() {
|
|
return Genode::Signal_context_capability(); }
|
|
|
|
|
|
/***********************
|
|
** Session interface **
|
|
***********************/
|
|
|
|
void start()
|
|
{
|
|
call<Rpc_start>();
|
|
|
|
/* reset tail pointer */
|
|
stream()->reset();
|
|
}
|
|
|
|
void stop() { call<Rpc_stop>(); }
|
|
|
|
|
|
/**********************************
|
|
** Session interface extensions **
|
|
**********************************/
|
|
|
|
/**
|
|
* Wait for progress signal
|
|
*/
|
|
void wait_for_progress()
|
|
{
|
|
if (!_progress.cap.valid()) {
|
|
Genode::warning("Progress signal is not installed, will not block "
|
|
"(enable in 'Audio_out::Connection')");
|
|
return;
|
|
}
|
|
|
|
_progress.wait();
|
|
}
|
|
|
|
/**
|
|
* Wait for allocation signal
|
|
*
|
|
* This can be used when the 'Stream' is full and the application wants
|
|
* to block until the stream has free elements again.
|
|
*/
|
|
void wait_for_alloc()
|
|
{
|
|
if (!_alloc.cap.valid()) {
|
|
Genode::warning("Alloc signal is not installed, will not block "
|
|
"(enable in 'Audio_out::Connection')");
|
|
return;
|
|
}
|
|
|
|
_alloc.wait();
|
|
}
|
|
|
|
/**
|
|
* Submit a packet
|
|
*/
|
|
void submit(Packet *packet)
|
|
{
|
|
bool empty = stream()->empty();
|
|
|
|
packet->_submit();
|
|
if (empty)
|
|
_data_avail.submit();
|
|
}
|
|
};
|
|
|
|
#endif /* _INCLUDE__AUDIO_OUT_SESSION__CLIENT_H_ */
|