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:
2026-06-20 15:19:34 +02:00
parent 2130d95ed5
commit 80bffc0fdd
11 changed files with 315 additions and 104 deletions
+19
View File
@@ -0,0 +1,19 @@
#pragma once
#include "Metadata.h"
#include <sqlite3.h>
using queue = std::vector<Track>;
class Database {
public:
Database( const char* filename, sqlite3** db );
~Database();
void fetch( const std::string& query );
void fetchAlbum( const std::string& album );
void addSong( );
private:
sqlite3* db_;
sqlite3_stmt* stmnt;
};
+6 -1
View File
@@ -19,5 +19,10 @@ struct Metadata {
};
struct Track {
std::string_view artist;
std::string_view title;
std::string_view album;
unsigned int trackNr;
unsigned int length;
const char *filePath;
};
+20 -16
View File
@@ -6,35 +6,39 @@
#include <memory>
struct PlaybackState {
ma_decoder decoder{};
std::atomic<bool> finished{ false };
ma_decoder decoder {};
std::atomic<bool> finished { false };
};
class PlaybackEngine {
public:
PlaybackEngine();
~PlaybackEngine();
public:
PlaybackEngine ();
~PlaybackEngine ();
static void data_callback( ma_device* pDevice, void* pOutput, const void*, ma_uint32 frameCount );
void configureDevice();
void configureDecoder();
void initDevice();
void initDecoder( const char* filePath );
static void data_callback ( ma_device *pDevice, void *pOutput, const void *, ma_uint32 frameCount );
void configureDevice ();
void configureDecoder ();
void initDevice ();
void initDecoder ( const char *filePath );
void uninitDecoder();
void startPlayback();
void stopPlayback();
void pausePlayback() { stopPlayback(); };
int isFinished() const;
void startPlayback ();
void stopPlayback ();
void pausePlayback () { stopPlayback(); };
void seek ( ma_uint64 frame );
int isFinished () const;
private:
ma_uint64 getPosition ();
private:
ma_device device_;
ma_format format_;
unsigned int channels_;
unsigned int sampleRate_;
PlaybackState state;
//config
ma_uint64 cursor_;
// config
ma_decoder_config decoderConfig;
ma_device_config deviceConfig;
};
+36 -43
View File
@@ -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;
};
+9
View File
@@ -11,10 +11,13 @@ class PlayerEngine {
unsigned int sampleRate_;
unsigned int channels_ = 2;
ma_format format_ = ma_format_unknown;
ma_context context_;
public:
PlayerEngine();
PlayerEngine( unsigned int sampleRate, unsigned int channels, ma_format format );
~PlayerEngine();
ma_device getDevice() const;
unsigned int getChannels() const;
unsigned int getSampleRate() const;
@@ -24,4 +27,10 @@ class PlayerEngine {
void setSampleRate( unsigned int sampleRate );
void setChannels( unsigned int channels );
void setFormat( ma_format format );
ma_device_data_proc data_callback();
void configureDevice( ma_context& context );
void initDevice ();
void initEngine();
};
+17
View File
@@ -0,0 +1,17 @@
#pragma once
#include "Player.h"
class PlayerLocal : public Player {
public:
void next() override;
void previous() override;
ma_uint64 getPlayheadPosition () override;
void loadFile ( Track track ) override;
void addToQueue( Track& track );
void playQueue();
private:
unsigned int currentTrack_;
};