-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* moved trackmetrics playStart back to TrackPlayer because needed * changes in track queueing * Changed structural from spirc to connectState * minor changes * minor clang-format changes
- Loading branch information
1 parent
b489cc9
commit 4f15632
Showing
39 changed files
with
2,816 additions
and
1,612 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /** | ||
| * TO DO | ||
| * | ||
| * autoplay doesn't work for episodes | ||
| * | ||
| */ | ||
| #pragma once | ||
|
|
||
| #include <stdint.h> // for uint8_t, uint32_t | ||
| #include <deque> //for deque.. | ||
| #include <functional> //for function | ||
| #include <memory> // for shared_ptr | ||
| #include <string> // for string | ||
| #include <utility> // for pair | ||
| #include <variant> // for variant | ||
| #include <vector> // for vector | ||
|
|
||
| #include "PlayerContext.h" // for PlayerContext::resolveTracklist, jsonToTracklist... | ||
| #include "TrackPlayer.h" // for TrackPlayer | ||
| #include "TrackQueue.h" | ||
| #include "TrackReference.h" | ||
| #include "protobuf/connect.pb.h" // for PutStateRequest, DeviceState, PlayerState... | ||
|
|
||
| namespace cspot { | ||
| struct Context; | ||
| struct PlayerContext; | ||
|
|
||
| class DeviceStateHandler { | ||
| public: | ||
| //Command Callback Structure | ||
| enum CommandType { | ||
| STOP, | ||
| PLAY, | ||
| PAUSE, | ||
| DISC, | ||
| DEPLETED, | ||
| FLUSH, | ||
| PLAYBACK_START, | ||
| PLAYBACK, | ||
| SKIP_NEXT, | ||
| SKIP_PREV, | ||
| SEEK, | ||
| SET_SHUFFLE, | ||
| SET_REPEAT, | ||
| VOLUME, | ||
| TRACK_INFO, | ||
| }; | ||
|
|
||
| typedef std::variant<std::shared_ptr<cspot::QueuedTrack>, int32_t, bool> | ||
| CommandData; | ||
|
|
||
| struct Command { | ||
| CommandType commandType; | ||
| CommandData data; | ||
| }; | ||
|
|
||
| typedef std::function<void(Command)> StateCallback; | ||
|
|
||
| DeviceStateHandler(std::shared_ptr<cspot::Context>); | ||
| ~DeviceStateHandler(); | ||
|
|
||
| void disconnect(); | ||
|
|
||
| void putDeviceState(PutStateReason member_type = | ||
| PutStateReason::PutStateReason_PLAYER_STATE_CHANGED); | ||
| void putPlayerState(PutStateReason member_type = | ||
| PutStateReason::PutStateReason_PLAYER_STATE_CHANGED); | ||
| void handleConnectState(); | ||
| void sendCommand(CommandType, CommandData data = {}); | ||
|
|
||
| Device device = Device_init_zero; | ||
|
|
||
| std::vector<ProvidedTrack> currentTracks = {}; | ||
| StateCallback stateCallback; | ||
|
|
||
| uint64_t started_playing_at = 0; | ||
| uint32_t last_message_id = -1; | ||
| uint8_t offset = 0; | ||
| int64_t offsetFromStartInMillis = 0; | ||
|
|
||
| bool is_active = false; | ||
| bool reloadPreloadedTracks = true; | ||
| bool needsToBeSkipped = true; | ||
| bool playerStateChanged = false; | ||
|
|
||
| std::shared_ptr<cspot::TrackPlayer> trackPlayer; | ||
| std::shared_ptr<cspot::TrackQueue> trackQueue; | ||
| std::shared_ptr<cspot::Context> ctx; | ||
|
|
||
| private: | ||
| std::shared_ptr<PlayerContext> playerContext; | ||
|
|
||
| std::pair<uint8_t*, std::vector<ProvidedTrack>*> queuePacket = { | ||
| &offset, ¤tTracks}; | ||
| std::vector<std::pair<std::string, std::string>> metadata_map = {}; | ||
| std::vector<std::pair<std::string, std::string>> context_metadata_map = {}; | ||
| std::mutex playerStateMutex; | ||
| std::string context_uri, context_url; | ||
| void parseCommand(std::vector<uint8_t>& data); | ||
| void skip(CommandType dir, bool notify); | ||
|
|
||
| void unreference(char* string) { | ||
| if (string != NULL) | ||
| free(string); | ||
| string = NULL; | ||
| } | ||
|
|
||
| static void reloadTrackList(void*); | ||
| }; | ||
| } // namespace cspot |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.