← Back to branch summary

~ubuntu-branches/debian/sid/kodi/sid

« back to all changes in this revision

Viewing changes to xbmc/interfaces/json-rpc/AudioLibrary.cpp

  • Committer: Package Import Robot
  • Author(s): Balint Reczey
  • Date: 2015-08-18 14:16:59 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20150818141659-4lgq2pksj7918osz
Tags: 15.1+dfsg1-1
http://bugs.debian.org/795813
* New upstream release 15.0
  See http://www.kodi.tv/kodi-15-0-isengard-one-release-to-rule-them-all/
* Depend on libav.*-dev provided by src:ffmpeg
* Recommend udisks2 instead of udisks.
  Udisks has been removed from unstable but support for udisks2 is not
  implemented yet.
* Ship patch helping Jessie backports
* Refresh patches
* Eliminate __DATE__ macros from source to make build more reproducible
* Build-depend on libsdl2.*-dev instead of libsdl.*-dev
* Build-depend on libgif-dev
* Drop obsoleted fix of installed header's include paths
* Refresh include file list included by kodi-addons-dev
* Build depend on libcec (>= 3)
* Build-depend on groovy2 instead of groovy
* Sort build dependencies
* Fix packaging repository URL
* Remove removed files from debian/copyright
* Fix filenames with spaces in debian/copyright
* Ship TexturePacker in kodi-addons-dev in /usr/lib/kodi
* Build depend on libcec-platform-dev
* Stop using embedded gnulib modules in rsxs screensaver (Closes: #795813)
* Add missing copyright paragraphs to d/copyright
* Stop marking files as excluded which are removed from upstream tarball
  already
* Bump standards version to 3.9.6
* New upstream release 15.1
  See http://kodi.tv/kodi-15-1-isengard-maintenance-release/
* Move TexturePacker to kodi-bin
* Stop building TexturePacker statically

Show diffs side-by-side

added added

removed removed

Lines of Context:
xbmc/interfaces/json-rpc/AudioLibrary.cpp
28
28
#include "music/Artist.h"
29
29
#include "music/Album.h"
30
30
#include "music/Song.h"
31
 
#include "music/Artist.h"
32
31
#include "ApplicationMessenger.h"
33
32
#include "filesystem/Directory.h"
34
 
#include "filesystem/File.h"
35
33
#include "settings/Settings.h"
36
34
 
37
35
using namespace MUSIC_INFO;
130
128
 
131
129
  CMusicDbUrl musicUrl;
132
130
  musicUrl.FromString("musicdb://albums/");
 
131
 
 
132
  if (parameterObject["includesingles"].asBoolean())
 
133
    musicUrl.AddOption("show_singles", true);
 
134
 
133
135
  int artistID = -1, genreID = -1;
134
136
  const CVariant &filter = parameterObject["filter"];
135
137
  if (filter.isMember("artistid"))
208
210
 
209
211
  CMusicDbUrl musicUrl;
210
212
  musicUrl.FromString("musicdb://songs/");
 
213
 
 
214
  if (!parameterObject["includesingles"].asBoolean())
 
215
    musicUrl.AddOption("singles", false);
 
216
 
211
217
  int genreID = -1, albumID = -1, artistID = -1;
212
218
  const CVariant &filter = parameterObject["filter"];
213
219
  if (filter.isMember("artistid"))
508
514
    song.strComment = parameterObject["comment"].asString();
509
515
  if (ParameterNotNull(parameterObject, "musicbrainztrackid"))
510
516
    song.strMusicBrainzTrackID = parameterObject["musicbrainztrackid"].asString();
 
517
  if (ParameterNotNull(parameterObject, "playcount"))
 
518
    song.iTimesPlayed = parameterObject["playcount"].asInteger();
 
519
  if (ParameterNotNull(parameterObject, "lastplayed"))
 
520
    song.lastPlayed.SetFromDBDateTime(parameterObject["lastplayed"].asString());
511
521
 
512
522
  if (musicdatabase.UpdateSong(id, song) <= 0)
513
523
    return InternalError;
632
642
    // If we retrieved the list of songs by "artistid"
633
643
    // we sort by album (and implicitly by track number)
634
644
    if (artistID != -1)
635
 
      list.Sort(SortByAlbum, SortOrderAscending, SortAttributeIgnoreArticle);
 
645
      list.Sort(SortByAlbum, SortOrderAscending, CSettings::Get().GetBool("filelists.ignorethewhensorting") ? SortAttributeIgnoreArticle : SortAttributeNone);
636
646
    // If we retrieve the list of songs by "genreid"
637
647
    // we sort by artist (and implicitly by album and track number)
638
648
    else if (genreID != -1)
639
 
      list.Sort(SortByArtist, SortOrderAscending, SortAttributeIgnoreArticle);
 
649
      list.Sort(SortByArtist, SortOrderAscending, CSettings::Get().GetBool("filelists.ignorethewhensorting") ? SortAttributeIgnoreArticle : SortAttributeNone);
640
650
    // otherwise we sort by track number
641
651
    else
642
652
      list.Sort(SortByTrackNumber, SortOrderAscending);