Switch to unified view

a/application.cpp b/application.cpp
...
...
80
80
81
bool Application::setupRenderer(const string& uid)
81
bool Application::setupRenderer(const string& uid)
82
{
82
{
83
    delete rdco;
83
    delete rdco;
84
    delete avto;
84
    delete avto;
85
    rdco = 0;
86
    avto = 0;
85
87
86
    MRDH rdr = getRenderer(uid, false);
88
    MRDH rdr = getRenderer(uid, false);
87
    if (!rdr) {
89
    if (!rdr) {
88
        cerr << "Renderer " << uid << " not found" << endl;
90
        cerr << "Renderer " << uid << " not found" << endl;
89
        return false;
91
        return false;
...
...
205
    CONNECT(avto, secsInSongChanged(quint32), 
207
    CONNECT(avto, secsInSongChanged(quint32), 
206
            player, setCurrentPosition(quint32));
208
            player, setCurrentPosition(quint32));
207
209
208
    CONNECT(player, sig_volume_changed(int), rdco, setVolume(int));
210
    CONNECT(player, sig_volume_changed(int), rdco, setVolume(int));
209
    CONNECT(rdco, volumeChanged(int), player, setVolumeUi(int));
211
    CONNECT(rdco, volumeChanged(int), player, setVolumeUi(int));
210
    CONNECT(playlist, sig_selected_file_changed_md(const MetaData&, int, bool),
212
    CONNECT(playlist, sig_play_now(const MetaData&, int, bool),
211
            avto, changeTrack(const MetaData&, int, bool));
213
            avto, changeTrack(const MetaData&, int, bool));
214
    CONNECT(avto, endOfTrackIsNear(), playlist, psl_prepare_for_the_end());
215
    CONNECT(avto, tpStateChanged(int), playlist, psl_new_transport_state(int));
216
    CONNECT(avto, stoppedAtEOT(), playlist, psl_next_track());
217
    CONNECT(avto, newTrackPlaying(const QString&), 
218
            playlist, psl_ext_track_change(const QString&));
219
    CONNECT(playlist, sig_next_track_to_play(const MetaData&),
220
            avto, infoNextTrack(const MetaData&));
212
    CONNECT(playlist, sig_no_track_to_play(),  avto, stop());
221
    CONNECT(playlist, sig_no_track_to_play(),  avto, stop());
213
    CONNECT(playlist, sig_goon_playing(), avto, play());
222
    CONNECT(playlist, sig_goon_playing(), avto, play());
214
}
223
}
215
224
216
void Application::init_connections()
225
void Application::init_connections()
...
...
226
235
227
    CONNECT(player, show_small_playlist_items(bool), 
236
    CONNECT(player, show_small_playlist_items(bool), 
228
            ui_playlist, psl_show_small_playlist_items(bool));
237
            ui_playlist, psl_show_small_playlist_items(bool));
229
    CONNECT(player, sig_choose_renderer(), this, chooseRenderer());
238
    CONNECT(player, sig_choose_renderer(), this, chooseRenderer());
230
239
231
    CONNECT(playlist, sig_selected_file_changed_md(const MetaData&, int, bool),
240
    CONNECT(playlist, sig_track_metadata(const MetaData&, int, bool),
232
            player, update_track(const MetaData&, int, bool));
241
            player, update_track(const MetaData&, int, bool));
233
    CONNECT(playlist, sig_no_track_to_play(),  player, stopped());
242
    CONNECT(playlist, sig_no_track_to_play(),  player, stopped());
234
    CONNECT(playlist, sig_selected_file_changed(int), 
243
    CONNECT(playlist, sig_selected_file_changed(int), 
235
            ui_playlist, track_changed(int));
244
            ui_playlist, track_changed(int));
236
    CONNECT(playlist, sig_playlist_created(MetaDataList&, int, int), 
245
    CONNECT(playlist, sig_playlist_created(MetaDataList&, int, int),