Switch to unified view

a/playlist/playlist.cpp b/playlist/playlist.cpp
...
...
24
24
25
#include <QList>
25
#include <QList>
26
#include <QDebug>
26
#include <QDebug>
27
#include <QDir>
27
#include <QDir>
28
#include <QFileDialog>
28
#include <QFileDialog>
29
#include <QSettings>
29
30
30
#include "upadapt/upputils.h"
31
#include "upadapt/upputils.h"
31
#include "playlist.h"
32
#include "playlist.h"
32
#include "HelperStructs/Helper.h"
33
#include "HelperStructs/Helper.h"
33
34
...
...
89
        break;
90
        break;
90
    }
91
    }
91
    onRemoteTpState_impl(tps, sst);
92
    onRemoteTpState_impl(tps, sst);
92
}
93
}
93
94
95
void Playlist::onRemoteSecsInSong(quint32 s)
96
{
97
    if (m_play_idx >= 0 && m_play_idx < int(m_meta.size())) {
98
        m_meta[m_play_idx].curseeksecs = s;
99
    }
100
    onRemoteSecsInSong_impl(s);
101
}
102
103
void Playlist::psl_pause()
104
{
105
    if (m_play_idx >= 0 && m_play_idx < int(m_meta.size())) {
106
        m_meta[m_play_idx].pauseseeksecs = m_meta[m_play_idx].curseeksecs;
107
    }
108
    psl_pause_impl();
109
}
110
111
void Playlist::psl_change_track(int num)
112
{
113
    m_insertion_point = -1;
114
    m_play_idx = -1;
115
    psl_change_track_impl(num);
116
    QSettings settings;
117
    bool saveseek = settings.value("saveseekpos").toBool();
118
    if (saveseek && num >= 0 && num < int(m_meta.size())) {
119
        Playlist_Mode playlist_mode =
120
            CSettingsStorage::getInstance()->getPlaylistMode();
121
        int seeksecs = playlist_mode.repAll ? m_meta[num].pauseseeksecs :
122
            m_meta[num].curseeksecs;
123
        if (seeksecs > 0) {
124
            psl_seek(seeksecs);
125
        }
126
    }
127
}
128
94
Playlist_Mode Playlist::mode()
129
Playlist_Mode Playlist::mode()
95
{
130
{
96
    return CSettingsStorage::getInstance()->getPlaylistMode();
131
    return CSettingsStorage::getInstance()->getPlaylistMode();
97
}
132
}
98
133
...
...
179
        " ninserttracks " <<  v_md.size() << 
214
        " ninserttracks " <<  v_md.size() << 
180
        " m_meta.size() " << m_meta.size();
215
        " m_meta.size() " << m_meta.size();
181
216
182
    emit sig_sync();
217
    emit sig_sync();
183
218
219
    Playlist_Mode playlist_mode =
184
    Playlist_Mode playlist_mode = CSettingsStorage::getInstance()->getPlaylistMode();
220
        CSettingsStorage::getInstance()->getPlaylistMode();
185
    if (playlist_mode.replace)
221
    if (playlist_mode.replace)
186
        psl_clear_playlist();
222
        psl_clear_playlist();
187
223
188
    int afteridx = -1;
224
    int afteridx = -1;
189
225