Commit d11827ea authored by Matěj Laitl's avatar Matěj Laitl
Browse files

Remove Last.fm Skip button for streams

Last.fm API no longer supports it, don't confuse users.

BUG: 305576
FIXED-IN: 2.7
parent 8a8eae3b
......@@ -6,6 +6,7 @@ VERSION 2.7-Beta 1
FEATURES:
CHANGES:
* Last.fm Skip button removed; Last.fm API no longer provides it. (BR 305576)
* Optional liblastfm dependency raised to 1.0.0. (BR 302597)
* Add composer button to wikipedia applet (BR 272982)
......
......@@ -886,11 +886,6 @@ MainWindow::createActions()
//action->setGlobalShortcut( KShortcut( Qt::META + Qt::Key_B ) );
connect( action, SIGNAL( triggered() ), SIGNAL( banTrack() ) );
action = new KAction( i18n( "Last.fm: Skip Current Track" ), this );
ac->addAction( "skipTrack", action );
action->setGlobalShortcut( KShortcut( Qt::META + Qt::Key_S ) );
connect( action, SIGNAL( triggered() ), SIGNAL( skipTrack() ) );
action = new KAction( KIcon( "media-track-queue-amarok" ), i18n( "Queue Track" ), this );
ac->addAction( "queueTrack", action );
action->setShortcut( KShortcut( Qt::CTRL + Qt::Key_D ) );
......
......@@ -116,7 +116,6 @@ class AMAROK_EXPORT MainWindow : public KMainWindow
signals:
void loveTrack( Meta::TrackPtr track );
void banTrack();
void skipTrack();
void switchQueueStateShortcut();
public slots:
......
......@@ -550,19 +550,6 @@ LastFmService::ban()
lastfmTrack->ban();
}
void
LastFmService::skip()
{
DEBUG_BLOCK
Meta::TrackPtr track = The::engineController()->currentTrack();
LastFm::Track* lastfmTrack = dynamic_cast< LastFm::Track* >( track.data() );
if( lastfmTrack )
lastfmTrack->skip();
}
LastFmService *LastFmService::ms_service = 0;
......
......@@ -80,7 +80,6 @@ public:
private slots:
void love();
void skip();
void ban();
void playCustomStation();
......
......@@ -179,17 +179,6 @@ ScrobblerAdapter::trackPositionChanged( qint64 position, bool userSeek )
//debug() << "userSeek" << userSeek << "position:" << position << "m_lastPosition" << m_lastPosition << "m_totalPlayed" << m_totalPlayed;
}
void
ScrobblerAdapter::skip()
{
DEBUG_BLOCK
// NOTE doesn't exist in 1.2.1 lib... find replacement
//m_current.setRatingFlag( Track::Skipped );
}
void
ScrobblerAdapter::love()
{
......
......@@ -35,7 +35,6 @@ public:
ScrobblerAdapter( QObject *parent, const QString &clientId );
virtual ~ScrobblerAdapter();
void skip();
void love();
void ban();
......
......@@ -89,12 +89,6 @@ void Track::init( int id /* = -1*/ )
banAction->setStatusTip( i18n( "Ban this track" ) );
connect( banAction, SIGNAL( triggered() ), this, SLOT( ban() ) );
m_trackActions.append( banAction );
QAction * skipAction = new QAction( KIcon( "media-seek-forward-amarok" ), i18n( "Last.fm: &Skip" ), this );
skipAction->setShortcut( i18n( "Ctrl+S" ) );
skipAction->setStatusTip( i18n( "Skip this track" ) );
connect( skipAction, SIGNAL( triggered() ), this, SLOT( skip() ) );
m_trackActions.append( skipAction );
}
QString
......@@ -445,16 +439,6 @@ Track::ban()
DEBUG_BLOCK
d->wsReply = lastfm::MutableTrack( d->lastFmTrack ).ban();
connect( d->wsReply, SIGNAL( finished() ), this, SLOT( slotWsReply() ) );
if( The::engineController()->currentTrack() == this )
emit( skipTrack() );
}
void
Track::skip()
{
DEBUG_BLOCK
//MutableTrack( d->lastFmTrack ).skip();
emit( skipTrack() );
}
void Track::slotResultReady()
......
......@@ -106,14 +106,11 @@ namespace LastFm
public slots:
void love();
void ban();
void skip();
private slots:
void slotResultReady();
void slotWsReply();
signals:
void skipTrack(); // needed for communication with multiplayablecapability
private:
void init( int id = -1 );
//use a d-pointer because some code is going to work directly with LastFm::Track
......
......@@ -44,9 +44,6 @@ class MultiPlayableCapabilityImpl : public Capabilities::MultiPlayableCapability
{
Meta::TrackPtr trackptr( track );
subscribeTo( trackptr );
connect( track, SIGNAL( skipTrack() ), this, SLOT( skip() ) );
connect( The::mainWindow(), SIGNAL( skipTrack() ), SLOT( skip() ) );
}
virtual ~MultiPlayableCapabilityImpl()
......@@ -95,14 +92,6 @@ class MultiPlayableCapabilityImpl : public Capabilities::MultiPlayableCapability
}
}
virtual void skip()
{
fetchNext();
// now we force a new signal to be emitted to kick the enginecontroller to moving on
//KUrl url = m_track->playableUrl();
//emit playableUrlFetched( url );
}
void error( lastfm::ws::Error e )
{
if( e == lastfm::ws::SubscribersOnly || e == lastfm::ws::AuthenticationFailed )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment