Skip to content

Commit

Permalink
Quick test to use cvlc instead of mplayer
Browse files Browse the repository at this point in the history
  • Loading branch information
cpina committed Feb 1, 2024
1 parent 533d73b commit 074bbc6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
10 changes: 5 additions & 5 deletions configuration/stations.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
"stream": "http://media-ice.musicradio.com/SmoothUKMP3?amsparams=playerid:UKRP;skey:1513640000;&awparams=kxsegs:||;&kuid="
},
"2": {
"name": "BBC 5 Live",
"stream": "http://stream.live.vc.bbcmedia.co.uk/bbc_radio_five_live"
"name": "Rock FM",
"stream": "https://rockfm-cope.flumotion.com/playlist.m3u8"
},
"3": {
"name": "BBC 6 Music",
"stream": "http://stream.live.vc.bbcmedia.co.uk/bbc_6music"
"name": "RAC 105",
"stream": "https://20133.live.streamtheworld.com/RAC105AAC/HLS/playlist.m3u8"
},
"4": {
"name": "BBC Radio 2",
"stream": "http://stream.live.vc.bbcmedia.co.uk/bbc_radio_two"
},
"5": {
"name": "RAC 105",
"stream": "http://streaming.rac105.cat"
"stream": "https://20133.live.streamtheworld.com/RAC105AAC/HLS/playlist.m3u8"
},
"6": {
"name": "RAC1",
Expand Down
2 changes: 1 addition & 1 deletion mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ void MainWindow::setupInputHandling()

int MainWindow::greaterStationNumber()
{
QStringList actions = m_actions.numbers().toList();
QStringList actions = m_actions.numbers().values();

std::sort(actions.begin(), actions.end(), [](QString a, QString b) { return a.toInt() > b.toInt();});

Expand Down
5 changes: 3 additions & 2 deletions player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ void Player::play(const QString &url)
connect(m_player.data(), &QProcess::readyReadStandardOutput,
this, &Player::processMplayerOutput);

startAndLog("mplayer", QStringList{"-quiet", url});
emit song("Loading...");
// startAndLog("mplayer", QStringList{"-quiet", url});
startAndLog("cvlc", QStringList{url});
emit song("");
}

QString Player::argumentsToString(const QStringList& arguments)
Expand Down

0 comments on commit 074bbc6

Please sign in to comment.