Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gnu-fm
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
16
Issues
16
List
Boards
Labels
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gnu.io
gnu-fm
Commits
ccc4b05a
Commit
ccc4b05a
authored
Jul 01, 2011
by
Mike Sheldon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for loving and banning tracks in the Meego client
parent
2b23491b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
79 additions
and
19 deletions
+79
-19
clients/meego/librefm/src/StationPage.qml
clients/meego/librefm/src/StationPage.qml
+40
-17
clients/meego/librefm/src/librefm.qml
clients/meego/librefm/src/librefm.qml
+3
-1
clients/meego/librefm/src/main.cpp
clients/meego/librefm/src/main.cpp
+2
-0
clients/meego/librefm/src/servercomm.cpp
clients/meego/librefm/src/servercomm.cpp
+32
-1
clients/meego/librefm/src/servercomm.h
clients/meego/librefm/src/servercomm.h
+2
-0
No files found.
clients/meego/librefm/src/StationPage.qml
View file @
ccc4b05a
...
...
@@ -25,7 +25,7 @@ Page {
Column
{
anchors.horizontalCenter
:
parent
.
horizontalCenter
spacing
:
20
spacing
:
35
Image
{
id
:
imgLibre
...
...
@@ -39,28 +39,44 @@ Page {
id
:
lblStationName
text
:
"
"
anchors.horizontalCenter
:
parent
.
horizontalCenter
}
Image
{
id
:
imgCover
source
:
"
empty-album.png
"
anchors.horizontalCenter
:
parent
.
horizontalCenter
height
:
200
width
:
200
anchors.verticalCenterOffset
:
5
font.weight
:
Font
.
Bold
font.pixelSize
:
30
}
Row
{
spacing
:
50
anchors.horizontalCenter
:
parent
.
horizontalCenter
Label
{
id
:
lblArtist
text
:
"
Tuning in...
"
}
Label
{
id
:
lblSpacer
Image
{
id
:
imgCover
source
:
"
empty-album.png
"
height
:
200
width
:
200
}
Label
{
id
:
lblTrack
Column
{
spacing
:
40
anchors.verticalCenter
:
parent
.
verticalCenter
Row
{
anchors.horizontalCenter
:
parent
.
horizontalCenter
Label
{
id
:
lblArtist
text
:
"
Tuning in...
"
}
Label
{
id
:
lblSpacer
}
Label
{
id
:
lblTrack
}
}
Slider
{
id
:
songProgress
value
:
0.5
}
}
}
ButtonRow
{
...
...
@@ -73,6 +89,10 @@ Page {
anchors.verticalCenterOffset
:
-
1
source
:
"
ban.png
"
}
onClicked
:
{
rootWin
.
ban
();
rootWin
.
next
();
}
}
Button
{
...
...
@@ -152,6 +172,9 @@ Page {
anchors.verticalCenterOffset
:
-
1
source
:
"
love.png
"
}
onClicked
:
{
rootWin
.
love
();
}
}
}
...
...
clients/meego/librefm/src/librefm.qml
View file @
ccc4b05a
...
...
@@ -12,6 +12,8 @@ PageStackWindow {
signal
prev
()
signal
play
()
signal
pause
()
signal
love
()
signal
ban
()
function
openFile
(
file
)
{
var
component
=
Qt
.
createComponent
(
file
)
...
...
@@ -24,6 +26,6 @@ PageStackWindow {
ToolBarLayout
{
id
:
commonTools
visible
:
false
ToolIcon
{
iconId
:
"
toolbar-back
"
;
onClicked
:
{
pageStack
.
pop
();
}
}
ToolIcon
{
iconId
:
"
toolbar-back
"
;
onClicked
:
{
pageStack
.
pop
();
pause
();
}
}
}
}
clients/meego/librefm/src/main.cpp
View file @
ccc4b05a
...
...
@@ -33,6 +33,8 @@ int main(int argc, char *argv[])
QObject
::
connect
(
root
,
SIGNAL
(
prev
()),
&
sc
,
SLOT
(
prev
()));
QObject
::
connect
(
root
,
SIGNAL
(
play
()),
&
sc
,
SLOT
(
play
()));
QObject
::
connect
(
root
,
SIGNAL
(
pause
()),
&
sc
,
SLOT
(
pause
()));
QObject
::
connect
(
root
,
SIGNAL
(
love
()),
&
sc
,
SLOT
(
love
()));
QObject
::
connect
(
root
,
SIGNAL
(
ban
()),
&
sc
,
SLOT
(
ban
()));
QObject
::
connect
((
QObject
*
)
view
.
engine
(),
SIGNAL
(
quit
()),
&
app
,
SLOT
(
quit
()));
view
.
showFullScreen
();
...
...
clients/meego/librefm/src/servercomm.cpp
View file @
ccc4b05a
...
...
@@ -207,11 +207,11 @@ void ServerComm::parseTrack(QDomNode trackNode) {
}
}
}
qDebug
()
<<
"Artist: "
<<
t
->
artist
;
playlist
->
append
(
*
t
);
}
void
ServerComm
::
loadSong
(
int
song
)
{
qDebug
()
<<
"Loading song"
;
currentSong
=
song
;
Track
t
=
playlist
->
at
(
song
);
playing
(
t
.
artist
,
t
.
album
,
t
.
title
,
t
.
image
);
...
...
@@ -225,19 +225,50 @@ void ServerComm::loadSong(int song) {
}
void
ServerComm
::
play
()
{
qDebug
()
<<
"Play"
;
media
->
play
();
}
void
ServerComm
::
pause
()
{
qDebug
()
<<
"Pausing"
;
media
->
pause
();
}
void
ServerComm
::
next
()
{
qDebug
()
<<
"Next song"
;
loadSong
(
++
currentSong
);
}
void
ServerComm
::
prev
()
{
qDebug
()
<<
"Previous song"
;
if
(
currentSong
>
0
)
{
loadSong
(
--
currentSong
);
}
}
void
ServerComm
::
love
()
{
qDebug
()
<<
"Loving song"
;
Track
t
=
playlist
->
at
(
currentSong
);
QNetworkAccessManager
*
love_netman
=
new
QNetworkAccessManager
(
this
);
QUrl
url
=
QUrl
(
ws_url
);
QByteArray
params
;
params
.
append
(
"method=track.love"
);
params
.
append
(
"&sk="
);
params
.
append
(
ws_sk
);
params
.
append
(
"&artist="
);
params
.
append
(
t
.
artist
);
params
.
append
(
"&track="
);
params
.
append
(
t
.
title
);
love_netman
->
post
(
QNetworkRequest
(
url
),
params
);
}
void
ServerComm
::
ban
()
{
qDebug
()
<<
"Banning song"
;
Track
t
=
playlist
->
at
(
currentSong
);
QNetworkAccessManager
*
ban_netman
=
new
QNetworkAccessManager
(
this
);
QUrl
url
=
QUrl
(
ws_url
);
QByteArray
params
;
params
.
append
(
"method=track.ban"
);
params
.
append
(
"&sk="
);
params
.
append
(
ws_sk
);
params
.
append
(
"&artist="
);
params
.
append
(
t
.
artist
);
params
.
append
(
"&track="
);
params
.
append
(
t
.
title
);
ban_netman
->
post
(
QNetworkRequest
(
url
),
params
);
}
clients/meego/librefm/src/servercomm.h
View file @
ccc4b05a
...
...
@@ -50,6 +50,8 @@ public slots:
void
pause
();
void
next
();
void
prev
();
void
love
();
void
ban
();
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment