Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
d110131a
Commit
d110131a
authored
Oct 22, 2013
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Playlist: refresh new tags after database update
Fixes regression from commit
e96779de
.
parent
10bc1a9a
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
86 additions
and
23 deletions
+86
-23
Makefile.am
Makefile.am
+1
-0
Partition.cxx
src/Partition.cxx
+1
-1
Playlist.cxx
src/Playlist.cxx
+0
-7
Playlist.hxx
src/Playlist.hxx
+4
-1
PlaylistUpdate.cxx
src/PlaylistUpdate.cxx
+80
-0
Queue.cxx
src/Queue.cxx
+0
-9
Queue.hxx
src/Queue.hxx
+0
-5
No files found.
Makefile.am
View file @
d110131a
...
@@ -178,6 +178,7 @@ src_mpd_SOURCES = \
...
@@ -178,6 +178,7 @@ src_mpd_SOURCES = \
src/PlaylistVector.cxx src/PlaylistVector.hxx
\
src/PlaylistVector.cxx src/PlaylistVector.hxx
\
src/PlaylistInfo.hxx
\
src/PlaylistInfo.hxx
\
src/PlaylistDatabase.cxx src/PlaylistDatabase.hxx
\
src/PlaylistDatabase.cxx src/PlaylistDatabase.hxx
\
src/PlaylistUpdate.cxx
\
src/IdTable.hxx
\
src/IdTable.hxx
\
src/Queue.cxx src/Queue.hxx
\
src/Queue.cxx src/Queue.hxx
\
src/QueuePrint.cxx src/QueuePrint.hxx
\
src/QueuePrint.cxx src/QueuePrint.hxx
\
...
...
src/Partition.cxx
View file @
d110131a
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
void
void
Partition
::
DatabaseModified
()
Partition
::
DatabaseModified
()
{
{
playlist
.
FullIncrementVersions
();
playlist
.
DatabaseModified
();
}
}
void
void
...
...
src/Playlist.cxx
View file @
d110131a
...
@@ -29,13 +29,6 @@
...
@@ -29,13 +29,6 @@
#include <assert.h>
#include <assert.h>
void
void
playlist
::
FullIncrementVersions
()
{
queue
.
ModifyAll
();
idle_add
(
IDLE_PLAYLIST
);
}
void
playlist
::
TagModified
(
Song
&&
song
)
playlist
::
TagModified
(
Song
&&
song
)
{
{
if
(
!
playing
||
song
.
tag
==
nullptr
)
if
(
!
playing
||
song
.
tag
==
nullptr
)
...
...
src/Playlist.hxx
View file @
d110131a
...
@@ -135,7 +135,10 @@ public:
...
@@ -135,7 +135,10 @@ public:
*/
*/
void
TagModified
(
Song
&&
song
);
void
TagModified
(
Song
&&
song
);
void
FullIncrementVersions
();
/**
* The database has been modified. Pull all updates.
*/
void
DatabaseModified
();
PlaylistResult
AppendSong
(
player_control
&
pc
,
PlaylistResult
AppendSong
(
player_control
&
pc
,
Song
*
song
,
Song
*
song
,
...
...
src/PlaylistUpdate.cxx
0 → 100644
View file @
d110131a
/*
* Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
#include "Playlist.hxx"
#include "DatabaseGlue.hxx"
#include "DatabasePlugin.hxx"
#include "Song.hxx"
#include "tag/Tag.hxx"
#include "Idle.hxx"
#include "util/Error.hxx"
static
bool
UpdatePlaylistSong
(
const
Database
&
db
,
Song
&
song
)
{
if
(
!
song
.
IsInDatabase
()
||
!
song
.
IsDetached
())
/* only update Songs instances that are "detached"
from the Database */
return
false
;
Song
*
original
=
db
.
GetSong
(
song
.
uri
,
IgnoreError
());
if
(
original
==
nullptr
)
/* not found - shouldn't happen, because the update
thread should ensure that all stale Song instances
have been purged */
return
false
;
if
(
original
->
mtime
==
song
.
mtime
)
{
/* not modified */
db
.
ReturnSong
(
original
);
return
false
;
}
song
.
mtime
=
original
->
mtime
;
if
(
original
->
tag
!=
nullptr
)
song
.
ReplaceTag
(
Tag
(
*
original
->
tag
));
db
.
ReturnSong
(
original
);
return
true
;
}
void
playlist
::
DatabaseModified
()
{
const
Database
*
db
=
GetDatabase
();
if
(
db
==
nullptr
)
/* how can this ever happen? */
return
;
bool
modified
=
false
;
for
(
unsigned
i
=
0
,
n
=
queue
.
GetLength
();
i
!=
n
;
++
i
)
{
if
(
UpdatePlaylistSong
(
*
db
,
queue
.
Get
(
i
)))
{
queue
.
ModifyAtPosition
(
i
);
modified
=
true
;
}
}
if
(
modified
)
{
queue
.
IncrementVersion
();
idle_add
(
IDLE_PLAYLIST
);
}
}
src/Queue.cxx
View file @
d110131a
...
@@ -85,15 +85,6 @@ queue::ModifyAtOrder(unsigned _order)
...
@@ -85,15 +85,6 @@ queue::ModifyAtOrder(unsigned _order)
ModifyAtPosition
(
position
);
ModifyAtPosition
(
position
);
}
}
void
queue
::
ModifyAll
()
{
for
(
unsigned
i
=
0
;
i
<
length
;
i
++
)
items
[
i
].
version
=
version
;
IncrementVersion
();
}
unsigned
unsigned
queue
::
Append
(
Song
*
song
,
uint8_t
priority
)
queue
::
Append
(
Song
*
song
,
uint8_t
priority
)
{
{
...
...
src/Queue.hxx
View file @
d110131a
...
@@ -259,11 +259,6 @@ struct queue {
...
@@ -259,11 +259,6 @@ struct queue {
void
ModifyAtOrder
(
unsigned
order
);
void
ModifyAtOrder
(
unsigned
order
);
/**
/**
* Marks all songs as "modified" and increments the version number.
*/
void
ModifyAll
();
/**
* Appends a song to the queue and returns its position. Prior to
* Appends a song to the queue and returns its position. Prior to
* that, the caller must check if the queue is already full.
* that, the caller must check if the queue is already full.
*
*
...
...
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