Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix libxrme build errors on windows

Browse Source
This commit is contained in:
David Sansome 2011-03-04 20:50:17 +00:00
parent d357a1cb6e
commit 66a5a1484b
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
3rdparty/libxrme/connection.cpp vendored
View File

@ -158,36 +158,36 @@ QString Connection::jid_resource() const { return d->jid_resource_; }
QString Connection::jid_host() const { return d->jid_host_; } QString Connection::jid_host() const { return d->jid_host_; }
bool Connection::is_verbose() const { return d->verbose_; } bool Connection::is_verbose() const { return d->verbose_; }
void Connection::SetMediaPlayer(MediaPlayerInterface* interface) { void Connection::SetMediaPlayer(MediaPlayerInterface* iface) {
if (d->media_player_) { if (d->media_player_) {
qWarning() << "Connection::SetMediaPlayer: this connection already has a" qWarning() << "Connection::SetMediaPlayer: this connection already has a"
" MediaPlayerInterface set"; " MediaPlayerInterface set";
return; return;
} }
if (!interface) { if (!iface) {
qWarning() << "Connection::SetMediaPlayer called with NULL interface"; qWarning() << "Connection::SetMediaPlayer called with NULL interface";
return; return;
} }
d->media_player_ = interface; d->media_player_ = iface;
d->handlers_ << new MediaPlayerHandler(interface); d->handlers_ << new MediaPlayerHandler(iface);
} }
void Connection::SetRemoteControl(RemoteControlInterface* interface) { void Connection::SetRemoteControl(RemoteControlInterface* iface) {
if (d->media_player_) { if (d->media_player_) {
qWarning() << "Connection::RemoteControlInterface: this connection already" qWarning() << "Connection::RemoteControlInterface: this connection already"
" has a RemoteControlInterface set"; " has a RemoteControlInterface set";
return; return;
} }
if (!interface) { if (!iface) {
qWarning() << "Connection::SetRemoteControl called with NULL interface"; qWarning() << "Connection::SetRemoteControl called with NULL interface";
return; return;
} }
d->remote_control_ = interface; d->remote_control_ = iface;
d->handlers_ << new RemoteControlHandler(interface); d->handlers_ << new RemoteControlHandler(iface);
} }
bool Connection::is_connected() const { bool Connection::is_connected() const {

4
3rdparty/libxrme/connection.h vendored
View File

@ -92,14 +92,14 @@ public:
// remote control agents. Should be called before calling Connect(). The // remote control agents. Should be called before calling Connect(). The
// Connection will NOT take ownership of the MediaPlayerInterface, and the // Connection will NOT take ownership of the MediaPlayerInterface, and the
// MediaPlayerInterface MUST stay alive for as long as the connection. // MediaPlayerInterface MUST stay alive for as long as the connection.
void SetMediaPlayer(MediaPlayerInterface* interface); void SetMediaPlayer(MediaPlayerInterface* iface);
// Sets a remote control on the connection. Calling this means the XRME agent // Sets a remote control on the connection. Calling this means the XRME agent
// will advertise itself as a remote control, and will receive state changes // will advertise itself as a remote control, and will receive state changes
// from media player agents. Should be called before calling Connect(). The // from media player agents. Should be called before calling Connect(). The
// Connection will NOT take ownership of the RemoteControlInterface, and the // Connection will NOT take ownership of the RemoteControlInterface, and the
// RemoteControlInterface MUST stay alive for as long as the connection. // RemoteControlInterface MUST stay alive for as long as the connection.
void SetRemoteControl(RemoteControlInterface* interface); void SetRemoteControl(RemoteControlInterface* iface);
// Returns true after Connected() is emitted. // Returns true after Connected() is emitted.
bool is_connected() const; bool is_connected() const;

4
3rdparty/libxrme/mediaplayerhandler.cpp vendored
View File

@ -29,8 +29,8 @@
namespace xrme { namespace xrme {
MediaPlayerHandler::MediaPlayerHandler(MediaPlayerInterface* interface) MediaPlayerHandler::MediaPlayerHandler(MediaPlayerInterface* iface)
: interface_(interface) { : interface_(iface) {
interface_->Attach(this); interface_->Attach(this);
} }

4
3rdparty/libxrme/remotecontrolhandler.cpp vendored
View File

@ -28,8 +28,8 @@
namespace xrme { namespace xrme {
RemoteControlHandler::RemoteControlHandler(RemoteControlInterface* interface) RemoteControlHandler::RemoteControlHandler(RemoteControlInterface* iface)
: interface_(interface) { : interface_(iface) {
interface_->Attach(this); interface_->Attach(this);
} }