|
Lines 40-46
Link Here
|
| 40 |
m_newTrack = false; |
40 |
m_newTrack = false; |
| 41 |
TQString newTrack; |
41 |
TQString newTrack; |
| 42 |
bool error = true; // Asume we have a error first. |
42 |
bool error = true; // Asume we have a error first. |
| 43 |
TQCString kaffeineIface("Kaffeine"), kaffeineGetTrack("getTitle()"); |
43 |
TQCString kaffeineIface("KaffeineIface"), kaffeineGetTrack("title()"); |
| 44 |
|
44 |
|
| 45 |
// see if kaffeine is registered with DCOP |
45 |
// see if kaffeine is registered with DCOP |
| 46 |
if ( m_client->isApplicationRegistered( "kaffeine" ) ) |
46 |
if ( m_client->isApplicationRegistered( "kaffeine" ) ) |
|
Lines 52-61
Link Here
|
| 52 |
if ( !m_client->call( "kaffeine", kaffeineIface, "isPlaying()", data, |
52 |
if ( !m_client->call( "kaffeine", kaffeineIface, "isPlaying()", data, |
| 53 |
replyType, replyData ) ) |
53 |
replyType, replyData ) ) |
| 54 |
{ |
54 |
{ |
| 55 |
kdDebug ( 14307 ) << k_funcinfo << " Trying DCOP interface of Kaffeine >= 0.5" << endl; |
55 |
kdDebug ( 14307 ) << k_funcinfo << " Trying DCOP interface of Kaffeine < 0.5" << endl; |
| 56 |
// Trying with the new Kaffeine DCOP interface (>=0.5) |
56 |
// Trying with the old Kaffeine DCOP interface (<0.5) |
| 57 |
kaffeineIface = "KaffeineIface"; |
57 |
kaffeineIface = "Kaffeine"; |
| 58 |
kaffeineGetTrack = "title()"; |
58 |
kaffeineGetTrack = "getTitle()"; |
| 59 |
if( !m_client->call( "kaffeine", kaffeineIface, "isPlaying()", data, replyType, replyData ) ) |
59 |
if( !m_client->call( "kaffeine", kaffeineIface, "isPlaying()", data, replyType, replyData ) ) |
| 60 |
{ |
60 |
{ |
| 61 |
kdDebug( 14307 ) << k_funcinfo << " DCOP error on Kaffeine." << endl; |
61 |
kdDebug( 14307 ) << k_funcinfo << " DCOP error on Kaffeine." << endl; |
|
Lines 85-91
Link Here
|
| 85 |
{ |
85 |
{ |
| 86 |
TQDataStream reply( replyData, IO_ReadOnly ); |
86 |
TQDataStream reply( replyData, IO_ReadOnly ); |
| 87 |
|
87 |
|
| 88 |
if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { |
88 |
if ( replyType == TQSTRING_OBJECT_NAME_STRING || |
|
|
89 |
replyType == "TQString" ) { |
| 89 |
reply >> newTrack; |
90 |
reply >> newTrack; |
| 90 |
} |
91 |
} |
| 91 |
} |
92 |
} |
|
Lines 94-99
Link Here
|
| 94 |
m_newTrack = true; |
95 |
m_newTrack = true; |
| 95 |
m_track = newTrack; |
96 |
m_track = newTrack; |
| 96 |
} |
97 |
} |
|
|
98 |
if ( kaffeineIface == "Kaffeine" ) |
| 99 |
{ |
| 100 |
// old Kaffeine DCOP interface (<0.5) |
| 101 |
return; |
| 102 |
} |
| 103 |
|
| 104 |
if ( m_client->call( "kaffeine", kaffeineIface, "album()", data, |
| 105 |
replyType, replyData ) ) |
| 106 |
{ |
| 107 |
TQDataStream reply( replyData, IO_ReadOnly ); |
| 108 |
|
| 109 |
if ( replyType == TQSTRING_OBJECT_NAME_STRING || |
| 110 |
replyType == "TQString" ) { |
| 111 |
reply >> m_album; |
| 112 |
} |
| 113 |
} |
| 114 |
|
| 115 |
if ( m_client->call( "kaffeine", kaffeineIface, "artist()", data, |
| 116 |
replyType, replyData ) ) |
| 117 |
{ |
| 118 |
TQDataStream reply( replyData, IO_ReadOnly ); |
| 119 |
|
| 120 |
if ( replyType == TQSTRING_OBJECT_NAME_STRING || |
| 121 |
replyType == "TQString" ) { |
| 122 |
reply >> m_artist; |
| 123 |
} |
| 124 |
} |
| 97 |
} |
125 |
} |
| 98 |
else |
126 |
else |
| 99 |
kdDebug ( 14307 ) << "Kaffeine is not running!\n" << endl; |
127 |
kdDebug ( 14307 ) << "Kaffeine is not running!\n" << endl; |