Ticket #8066: musicjump.diff

File musicjump.diff, 4.0 KB (added by bg_m@…, 14 years ago)

jump in music

  • ./mythplugins/mythmusic/mythmusic/miniplayer.h

     
    3232    void    updateTrackInfo(Metadata *mdata);
    3333    void    seekforward(void);
    3434    void    seekback(void);
     35    void    jumpforward(void);
     36    void    jumpback(void);
    3537    void    seek(int pos);
    3638    void    increaseRating(void);
    3739    void    decreaseRating(void);

  • ./mythplugins/mythmusic/mythmusic/playbackbox.h

     
    5151    void next();
    5252    void seekforward();
    5353    void seekback();
     54    void jumpforward();
     55    void jumpback();
    5456    void seek(int);
    5557    void stopAll();
    5658    void setShuffleMode(MusicPlayer::ShuffleMode mode);

  • ./mythplugins/mythmusic/mythmusic/playbackbox.cpp

     
    291291            else
    292292                seekback();
    293293        }
     294        else if (action == "JUMPFFWD")
     295                jumpforward();
     296        else if (action == "JUMPRWND")
     297                jumpback();
    294298        else if (action == "PAUSE")
    295299        {
    296300            if (gPlayer->isPlaying())
    … …  
    15391543    seek(nextTime);
    15401544}
    15411545
     1546void PlaybackBoxMusic::jumpforward()
     1547{
     1548    int nextTime = currentTime + 60;
     1549    if (nextTime > maxTime)
     1550        nextTime = maxTime;
     1551    seek(nextTime);
     1552}
     1553
     1554void PlaybackBoxMusic::jumpback()
     1555{
     1556    int nextTime = currentTime - 60;
     1557    if (nextTime < 0)
     1558        nextTime = 0;
     1559    seek(nextTime);
     1560}
     1561
     1562
    15421563void PlaybackBoxMusic::seek(int pos)
    15431564{
    15441565    if (gPlayer->getOutput())

  • ./mythplugins/mythmusic/mythmusic/miniplayer.cpp

     
    127127            seekforward();
    128128        else if (action == "RWND")
    129129            seekback();
     130        else if (action == "JUMPFFWD")
     131            jumpforward();
     132        else if (action == "JUMPRWND")
     133            jumpback();
    130134        else if (action == "PLAY")
    131135        {
    132136            if (gPlayer->isPlaying())
    … …  
    442446        nextTime = 0;
    443447    seek(nextTime);
    444448}
     449void MiniPlayer::jumpforward(void)
     450{
     451    int nextTime = m_currTime + 60;
     452    if (nextTime > m_maxTime)
     453        nextTime = m_maxTime;
     454    seek(nextTime);
     455}
     456
     457void MiniPlayer::jumpback(void)
     458{
     459    int nextTime = m_currTime - 60;
     460    if (nextTime < 0)
     461        nextTime = 0;
     462    seek(nextTime);
     463}
    445464
    446465void MiniPlayer::seek(int pos)
    447466{

  • ./mythplugins/mythmusic/mythmusic/main.cpp

     
    386386        "", "", showMiniPlayer, false);
    387387
    388388    REG_KEY("Music", "NEXTTRACK",  QT_TRANSLATE_NOOP("MythControls",
    389         "Move to the next track"),     ">,.,Z,End");
     389        "Move to the next track"),     "Z,End");
    390390    REG_KEY("Music", "PREVTRACK",  QT_TRANSLATE_NOOP("MythControls",
    391         "Move to the previous track"), ",,<,Q,Home");
     391        "Move to the previous track"), "Q,Home");
    392392    REG_KEY("Music", "FFWD",       QT_TRANSLATE_NOOP("MythControls",
    393         "Fast forward"),               "PgDown");
     393        "Fast forward"),               ".,>");
    394394    REG_KEY("Music", "RWND",       QT_TRANSLATE_NOOP("MythControls",
    395         "Rewind"),                     "PgUp");
     395        "Rewind"),                     ",,<");
     396    REG_KEY("Music", "JUMPFFWD",       QT_TRANSLATE_NOOP("MythControls",
     397        "Jump Fast forward"),               "PgDown");
     398    REG_KEY("Music", "JUMPRWND",       QT_TRANSLATE_NOOP("MythControls",
     399        "Jump Rewind"),                     "PgUp");
     400       
     401       
    396402    REG_KEY("Music", "PAUSE",      QT_TRANSLATE_NOOP("MythControls",
    397403        "Pause/Start playback"),       "P");
    398404    REG_KEY("Music", "PLAY",       QT_TRANSLATE_NOOP("MythControls",