MediaClient: Fix style for private methods and other cleanup

* Cleaned up some unneeded callbacks.
This commit is contained in:
Dario Casalinuovo
2017-01-18 20:19:02 +01:00
parent 28966a1456
commit d64dd7beea
9 changed files with 121 additions and 179 deletions
@@ -142,33 +142,21 @@ protected:
virtual void HandleSeek(bigtime_t mediaTime,
bigtime_t performanceTime);
virtual status_t HandleFormatSuggestion(media_type type,
virtual status_t FormatSuggestion(media_type type,
int32 quality, media_format* format);
// Called from BMediaConnection
status_t ConnectionDisconnected(BMediaConnection* conn);
status_t ConnectionReleased(BMediaConnection* conn);
private:
virtual void AddInput(BMediaInput* input);
virtual void AddOutput(BMediaOutput* output);
BMediaInput* FindInput(
const media_destination& dest) const;
BMediaOutput* FindOutput(
const media_source& source) const;
// Possible canditates for removal
void HandleTimeWarp(bigtime_t realTime,
bigtime_t performanceTime);
status_t SetTimeSource(
const media_client& timesource);
private:
void _Init();
void _Deinit();
void _AddInput(BMediaInput* input);
void _AddOutput(BMediaOutput* output);
BMediaInput* _FindInput(
const media_destination& dest) const;
BMediaOutput* _FindOutput(
const media_source& source) const;
status_t _ConnectInput(BMediaOutput* output,
const media_connection& input);
status_t _ConnectOutput(BMediaInput* input,
@@ -66,15 +66,14 @@ typedef struct media_connection {
BMessage* ToMessage() const;
private:
media_input MediaInput() const;
media_output MediaOutput() const;
media_input _MediaInput() const;
media_output _MediaOutput() const;
const media_source& Source() const;
const media_destination& Destination() const;
const media_source& _Source() const;
const media_destination& _Destination() const;
media_node RemoteNode() const;
media_node _RemoteNode() const;
private:
media_connection_id id;
media_client client;
@@ -84,11 +84,11 @@ protected:
bigtime_t* max) const;
private:
void ConnectionRegistered(BMediaClient* owner,
void _ConnectionRegistered(BMediaClient* owner,
media_connection_id id);
const media_source& Source() const;
const media_destination& Destination() const;
const media_source& _Source() const;
const media_destination& _Destination() const;
media_connection fConnection;
@@ -141,7 +141,7 @@ protected:
virtual void BufferReceived(BBuffer* buffer);
private:
media_input MediaInput() const;
media_input _MediaInput() const;
virtual void _ReservedMediaInput0();
virtual void _ReservedMediaInput1();
@@ -182,7 +182,7 @@ protected:
virtual status_t SendBuffer(BBuffer* buffer);
private:
media_output MediaOutput() const;
media_output _MediaOutput() const;
bool fEnabled;
size_t fFramesSent;
@@ -22,7 +22,6 @@ public:
B_WILL_START = 1, // performance_time
B_WILL_STOP, // performance_time immediate
B_WILL_SEEK, // performance_time media_time
B_WILL_TIMEWARP, // real_time performance_time
B_FORMAT_SUGGESTION, // media_type type, int32 quality,
// media_format* format
@@ -59,9 +58,6 @@ protected:
virtual void HandleSeek(bigtime_t mediaTime,
bigtime_t performanceTime);
virtual void HandleTimeWarp(bigtime_t realTime,
bigtime_t performanceTime);
virtual status_t HandleFormatSuggestion(media_type type,
int32 quality, media_format* format);