ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/truck/DashInterface/Display.cpp
(Generate patch)

Comparing SteeringWheelRemote/Audacious.cpp (file contents):
Revision 7 by douglas, 2007-05-06T22:12:04-07:00 vs.
Revision 12 by douglas, 2007-05-13T04:38:16-07:00

# Line 4 | Line 4
4   //
5   // $Id$
6  
7 + #include <cxx/standard.hh>
8 +
9   #include <audacious/beepctrl.h>
10  
11   #include "Audacious.hpp"
# Line 113 | Line 115 | void Audacious::SetBalance(int balance)
115          ::xmms_remote_set_balance(session, balance);
116   }
117  
118 < std::string Audacious::GetSkin() const
118 > cse::String Audacious::GetSkin() const
119   {
120          return ::xmms_remote_get_skin(session);
121   }
122  
123 < void Audacious::SetSkin(const std::string &skin)
123 > void Audacious::SetSkin(const cse::String &skin)
124   {
125 <        ::xmms_remote_set_skin(session, const_cast<char*>(skin.c_str()));
125 >        ::xmms_remote_set_skin(session, const_cast<char*>(skin.NullTerminate()));
126   }
127  
128 < std::string Audacious::GetPlaylistFile(int position) const
128 > cse::String Audacious::GetPlaylistFile(int position) const
129   {
130          return ::xmms_remote_get_playlist_file(session, position);
131   }
132  
133 < std::string Audacious::GetPlaylistTitle(int position) const
133 > cse::String Audacious::GetPlaylistTitle(int position) const
134   {
135          return ::xmms_remote_get_playlist_title(session, position);
136   }
# Line 198 | Line 200 | void Audacious::PlaylistNext()
200          ::xmms_remote_playlist_next(session);
201   }
202  
203 < void Audacious::PlaylistAddUrl(const std::string &url)
203 > void Audacious::PlaylistAddUrl(const cse::String &url)
204   {
205 <        ::xmms_remote_playlist_add_url_string(session, const_cast<char*>(url.c_str()));
205 >        ::xmms_remote_playlist_add_url_string(session, const_cast<char*>(url.NullTerminate()));
206   }
207  
208   bool Audacious::IsRunning() const
# Line 277 | Line 279 | void Audacious::PlayPause()
279          ::xmms_remote_play_pause(session);
280   }
281  
282 < void Audacious::PlaylistInsertUrl(const std::string &url, int position)
282 > void Audacious::PlaylistInsertUrl(const cse::String &url, int position)
283   {
284 <        ::xmms_remote_playlist_ins_url_string(session, const_cast<char*>(url.c_str()), position);
284 >        ::xmms_remote_playlist_ins_url_string(session, const_cast<char*>(url.NullTerminate()), position);
285   }
286  
287   // XMMS 1.2.11
# Line 341 | Line 343 | int Audacious::GetPlayqueueQueuePosition
343   }
344  
345   // Audacious 1.2
346 < void Audacious::SetSessionUri(const std::string &uri)
346 > void Audacious::SetSessionUri(const cse::String &uri)
347   {
348 <        ::audacious_set_session_uri(const_cast<char *>(uri.c_str()));
348 >        ::audacious_set_session_uri(const_cast<char *>(uri.NullTerminate()));
349   }
350  
351 < std::string Audacious::GetSessionUri() const
351 > cse::String Audacious::GetSessionUri() const
352   {
353          return ::audacious_get_session_uri(session);
354   }
# Line 357 | Line 359 | void Audacious::SetSessionType(Type type
359   }
360  
361   // Audacious 1.3
362 < void Audacious::PlaylistEnqueueToTemp(const std::string &string)
362 > void Audacious::PlaylistEnqueueToTemp(const cse::String &string)
363   {
364 <        ::xmms_remote_playlist_enqueue_to_temp(session, const_cast<char *>(string.c_str()));
364 >        ::xmms_remote_playlist_enqueue_to_temp(session, const_cast<char *>(string.NullTerminate()));
365   }
366  
367 < std::string Audacious::GetTupleFieldData(const std::string &field, int position)
367 > cse::String Audacious::GetTupleFieldData(const cse::String &field, int position)
368   {
369 <        return ::audacious_get_tuple_field_data(session, const_cast<char *>(field.c_str()), position);
369 >        return ::audacious_get_tuple_field_data(session, const_cast<char *>(field.NullTerminate()), position);
370   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines