← Back to branch summary

~ubuntu-branches/ubuntu/vivid/clementine/vivid-proposed

~ubuntu-branches/ubuntu/vivid/clementine/vivid-proposed

« back to all changes in this revision

Viewing changes to src/visualisations/projectmvisualisation.h

Committer: Package Import Robot
Author(s): Thomas Pierson
Date: 2014-07-12 22:07:28 UTC
mfrom: (1.1.5)
Revision ID: package-import@ubuntu.com-20140712220728-5p88h4szhjx1rfrd

Tags: 1.2.3+dfsg-1

http://bugs.debian.org/742163

http://bugs.debian.org/724615

http://bugs.debian.org/722471

* New upstream release. (Closes: #742163, #724615, #722471)
* Update debian/watch file.
* Bump Standards-Version to 3.9.5.
* Bump debian/copyright standard version to 1.0.
* Fix a misspelling issue in debian/copyright.

files added:
3rdparty/chromaprint

3rdparty/chromaprint/.gitignore

3rdparty/sha2/sha2.cpp

files removed:
.tx

.tx/config

3rdparty/sha2/sha2.c

dist/Info.plist

dist/clementine.spec

dist/clementine_1.0.0~lucid_source.ppa.upload

dist/clementine_1.0.0~maverick_source.ppa.upload

dist/clementine_1.0.0~natty_source.ppa.upload

dist/clementine_1.0.0~oneiric.diff.gz

dist/clementine_1.0.0~oneiric.dsc

dist/clementine_1.0.0~oneiric_source.changes

dist/clementine_1.0.0~oneiric_source.ppa.upload

dist/googlecode_upload.pyc

dist/maketarball.sh

dist/windows/clementine.nsi

files modified:
.pc/freebsd_isnt_kfreebsd.patch/src/CMakeLists.txt

.pc/remove-references-to-non-dfsg-files.patch/src/widgets/nowplayingwidget.cpp

3rdparty/sha2/CMakeLists.txt

3rdparty/sha2/sha2.h

CMakeLists.txt

Changelog

cmake/Summary.cmake

cmake/Version.cmake

debian/changelog

debian/control

debian/copyright

debian/watch

dist/googlecode_upload_all.py

dist/macdeploy.py

dist/windows/clementine.nsi.in

ext/libclementine-common/core/closure.cpp

ext/libclementine-common/core/closure.h

ext/libclementine-common/core/concurrentrun.h

ext/libclementine-remote/remotecontrolmessages.proto

ext/libclementine-tagreader/fmpsparser.cpp

ext/libclementine-tagreader/tagreader.cpp

src/CMakeLists.txt

src/config.h.in

src/core/crashreporting.h

src/core/database.cpp

src/core/database.h

src/core/deletefiles.cpp

src/core/deletefiles.h

src/core/mac_startup.mm

src/core/mac_utilities.h

src/core/macglobalshortcutbackend.h

src/core/mergedproxymodel.h

src/core/mpris2.cpp

src/core/mpris2.h

src/core/musicstorage.h

src/core/organise.cpp

src/core/organise.h

src/core/player.cpp

src/core/player.h

src/core/songloader.cpp

src/core/songloader.h

src/core/utilities.cpp

src/core/utilities.h

src/covers/albumcoverfetcher.h

src/covers/currentartloader.h

src/devices/connecteddevice.h

src/devices/devicekitlister.h

src/devices/devicelister.h

src/devices/devicemanager.cpp

src/devices/devicemanager.h

src/devices/deviceproperties.cpp

src/devices/deviceview.cpp

src/devices/deviceview.h

src/devices/giolister.cpp

src/devices/gpodloader.cpp

src/devices/gpodloader.h

src/devices/mtpdevice.h

src/devices/mtploader.cpp

src/devices/mtploader.h

src/engines/enginebase.h

src/engines/gstengine.cpp

src/engines/gstengine.h

src/engines/gstenginepipeline.cpp

src/engines/gstenginepipeline.h

src/globalsearch/globalsearchview.cpp

src/globalsearch/spotifysearchprovider.cpp

src/internet/boxservice.cpp

src/internet/cloudfileservice.h

src/internet/digitallyimportedservicebase.h

src/internet/groovesharkservice.cpp

src/internet/lastfmservice.cpp

src/internet/lastfmservice.h

src/internet/magnatunedownloaddialog.cpp

src/internet/magnatunedownloaddialog.h

src/internet/magnatuneservice.cpp

src/internet/oauthenticator.cpp

src/internet/savedradio.h

src/internet/skydriveservice.cpp

src/internet/spotifyblobdownloader.cpp

src/internet/spotifyservice.h

src/library/groupbydialog.h

src/library/library.h

src/library/librarydirectorymodel.cpp

src/library/librarydirectorymodel.h

src/library/libraryfilterwidget.h

src/library/librarymodel.cpp

src/library/librarymodel.h

src/library/libraryquery.cpp

src/library/libraryview.cpp

src/library/libraryview.h

src/main.cpp

src/moodbar/moodbarloader.cpp

src/networkremote/incomingdataparser.cpp

src/networkremote/networkremote.cpp

src/networkremote/networkremote.h

src/networkremote/outgoingdatacreator.cpp

src/networkremote/outgoingdatacreator.h

src/playlist/playlist.cpp

src/playlist/playlist.h

src/playlist/playlistbackend.cpp

src/playlist/playlistbackend.h

src/playlist/playlistdelegates.cpp

src/playlist/playlistitem.h

src/playlist/playlistsequence.h

src/playlist/playlistview.h

src/playlistparsers/plsparser.cpp

src/playlistparsers/xmlparser.h

src/smartplaylists/generator.h

src/smartplaylists/generator_fwd.h

src/smartplaylists/querywizardplugin.cpp

src/smartplaylists/querywizardplugin.h

src/smartplaylists/searchpreview.cpp

src/songinfo/echonestbiographies.cpp

src/songinfo/echonestbiographies.h

src/songinfo/echonestimages.cpp

src/songinfo/echonestimages.h

src/songinfo/echonesttags.cpp

src/songinfo/echonesttags.h

src/songinfo/songinfoview.h

src/songinfo/ultimatelyricsprovider.cpp

src/transcoder/transcoder.cpp

src/transcoder/transcoder.h

src/ui/albumcovermanager.cpp

src/ui/albumcovermanagerlist.cpp

src/ui/albumcoversearcher.h

src/ui/globalshortcutgrabber.mm

src/ui/globalshortcutssettingspage.h

src/ui/macsystemtrayicon.h

src/ui/macsystemtrayicon.mm

src/ui/mainwindow.cpp

src/ui/mainwindow.h

src/ui/networkremotesettingspage.cpp

src/ui/organisedialog.cpp

src/ui/organisedialog.h

src/visualisations/projectmvisualisation.cpp

src/visualisations/projectmvisualisation.h

src/widgets/fancytabwidget.h

src/widgets/fileview.h

src/widgets/nowplayingwidget.cpp

src/widgets/nowplayingwidget.h

src/widgets/osd.h

src/widgets/osd_x11.cpp

src/wiimotedev/shortcuts.cpp

src/wiimotedev/shortcuts.h

src/wiimotedev/wiimoteshortcutgrabber.h

Show diffs side-by-side

added added

removed removed

src/visualisations/projectmvisualisation.h

18

18

#ifndef PROJECTMVISUALISATION_H

19

19

#define PROJECTMVISUALISATION_H

20

20

21

#include <memory>

22

21

23

#include <QGraphicsScene>

22

24

#include <QBasicTimer>

23

25

#include <QSet>

24

26

25

#include <boost/scoped_ptr.hpp>

26

27

27

#include "engines/bufferconsumer.h"

28

28

29

29

class projectM;

77

77

int IndexOfPreset(const QString& path) const;

78

78

79

79

private:

80

boost::scoped_ptr<projectM> projectm_;

80

std::unique_ptr<projectM> projectm_;

81

81

ProjectMPresetModel* preset_model_;

82

82

Mode mode_;

83

83

int duration_;

84

84

85

boost::scoped_ptr<QTemporaryFile> temporary_font_;

85

std::unique_ptr<QTemporaryFile> temporary_font_;

86

86

87

87

std::vector<int> default_rating_list_;

88

88

Older »