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 12 by douglas, 2007-05-13T04:38:16-07:00 vs.
Revision 14 by douglas, 2007-05-14T18:24:34-07:00

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines