Add Database and refactor player/playback
Add Database class with SQLite fetch/fetchAlbum methods. Refactor PlaybackEngine (data callback, seek, getPosition, decoder lifecycle) and Player API (PlaybackEngine member, queue handling, PlayerLocal). Update Metadata::Track fields to include artist/title/album/trackNr/length.
This commit is contained in:
+36
-43
@@ -1,63 +1,56 @@
|
||||
#pragma once
|
||||
|
||||
#include "../include/Metadata.h"
|
||||
#include "../include/PlaybackEngine.h"
|
||||
#include "../include/miniaudio.h"
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <memory>
|
||||
|
||||
using Queue = std::vector<Track>;
|
||||
|
||||
class Player {
|
||||
public:
|
||||
virtual ~Player() = delete;
|
||||
public:
|
||||
virtual ~Player ();
|
||||
|
||||
virtual void initPlayer();
|
||||
void loadFile() const;
|
||||
virtual void initPlayer ();
|
||||
virtual void loadFile ( Track track );
|
||||
|
||||
// Transport Control
|
||||
virtual void play() const;
|
||||
virtual void stop() const;
|
||||
virtual void pause() const;
|
||||
virtual void previous() const;
|
||||
virtual void next() const;
|
||||
// Transport Control
|
||||
virtual void play ();
|
||||
virtual void stop ();
|
||||
virtual void pause ();
|
||||
virtual void previous ();
|
||||
virtual void next ();
|
||||
|
||||
virtual void getPlayheadPosition() const;
|
||||
virtual void setPlayheadPosition() const;
|
||||
virtual ma_uint64 getPlayheadPosition ();
|
||||
virtual void setPlayheadPosition () const;
|
||||
|
||||
// get Metadat
|
||||
virtual std::string& getArtist() const;
|
||||
virtual std::string& getTitle() const;
|
||||
virtual std::string& getAlbum() const;
|
||||
virtual unsigned int getTrackNr() const;
|
||||
// get Metadat
|
||||
virtual std::string &getArtist () const;
|
||||
virtual std::string &getTitle () const;
|
||||
virtual std::string &getAlbum () const;
|
||||
virtual unsigned int getTrackNr () const;
|
||||
|
||||
// Player Queue
|
||||
Queue getQueue() const;
|
||||
Queue clearQueue();
|
||||
Queue addToQueue( Track& track );
|
||||
Queue rempveFromQueue( Track& track );
|
||||
Queue shuffleQueue();
|
||||
// Player Queue
|
||||
Queue getQueue () const;
|
||||
Queue clearQueue ();
|
||||
void addToQueue ( Track &track );
|
||||
Queue rempveFromQueue ( Track &track );
|
||||
Queue shuffleQueue ();
|
||||
|
||||
private:
|
||||
std::string artist_;
|
||||
std::string title_;
|
||||
std::string album_;
|
||||
std::string trackNr_;
|
||||
std::string filePath_;
|
||||
Queue queue_;
|
||||
|
||||
unsigned int samplerate_ = 48000;
|
||||
unsigned int channels_ = 2;
|
||||
protected:
|
||||
PlaybackEngine PE_;
|
||||
Queue queue_;
|
||||
|
||||
private:
|
||||
std::string artist_;
|
||||
std::string title_;
|
||||
std::string album_;
|
||||
std::string trackNr_;
|
||||
std::string filePath_;
|
||||
|
||||
};
|
||||
|
||||
class PlayerLocal : public Player {
|
||||
public:
|
||||
virtual void initPlayer() override;
|
||||
virtual ma_engine_config configureEngine() override;
|
||||
|
||||
const virtual unsigned int getSamplerate() const;
|
||||
|
||||
unsigned int samplerate_ = 48000;
|
||||
unsigned int channels_ = 2;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user