g/mumsi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update Mumlib audio callback and and 'override'. #1

Browse Source
This commit is contained in:
Michał Słomkowski 2015-11-17 23:15:52 +01:00
parent bfbf646e24
commit 0548fca0dd
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MumbleCommunicator.cpp
View File

@ -10,8 +10,11 @@ namespace mumble {
MumbleCommunicator *communicator; MumbleCommunicator *communicator;
virtual void audio( virtual void audio(
int target,
int sessionId,
int sequenceNumber,
int16_t *pcm_data, int16_t *pcm_data,
uint32_t pcm_data_size) { uint32_t pcm_data_size) override {
communicator->onIncomingPcmSamples(pcm_data, pcm_data_size); communicator->onIncomingPcmSamples(pcm_data, pcm_data_size);
} }
}; };

2
MumbleCommunicator.hpp
View File

@ -32,7 +32,7 @@ namespace mumble {
~MumbleCommunicator(); ~MumbleCommunicator();
virtual void sendPcmSamples(int16_t *samples, unsigned int length); virtual void sendPcmSamples(int16_t *samples, unsigned int length) override;
void sendTextMessage(std::string message); void sendTextMessage(std::string message);

13
PjsuaCommunicator.cpp
View File

@ -16,7 +16,7 @@ namespace sip {
_LogWriter(Category &logger) _LogWriter(Category &logger)
: logger(logger) { } : logger(logger) { }
virtual void write(const pj::LogEntry &entry) { virtual void write(const pj::LogEntry &entry) override {
auto message = entry.msg.substr(0, entry.msg.size() - 1); // remove newline auto message = entry.msg.substr(0, entry.msg.size() - 1); // remove newline
@ -93,11 +93,11 @@ namespace sip {
communicator(comm), communicator(comm),
account(acc) { } account(acc) { }
virtual void onCallState(pj::OnCallStateParam &prm); virtual void onCallState(pj::OnCallStateParam &prm) override;
virtual void onCallMediaState(pj::OnCallMediaStateParam &prm); virtual void onCallMediaState(pj::OnCallMediaStateParam &prm) override;
virtual void onDtmfDigit(pj::OnDtmfDigitParam &prm); virtual void onDtmfDigit(pj::OnDtmfDigitParam &prm) override;
private: private:
sip::PjsuaCommunicator &communicator; sip::PjsuaCommunicator &communicator;
@ -109,9 +109,9 @@ namespace sip {
_Account(sip::PjsuaCommunicator &comm) _Account(sip::PjsuaCommunicator &comm)
: communicator(comm) { } : communicator(comm) { }
virtual void onRegState(pj::OnRegStateParam &prm); virtual void onRegState(pj::OnRegStateParam &prm) override;
virtual void onIncomingCall(pj::OnIncomingCallParam &iprm); virtual void onIncomingCall(pj::OnIncomingCallParam &iprm) override;
private: private:
sip::PjsuaCommunicator &communicator; sip::PjsuaCommunicator &communicator;
@ -328,4 +328,3 @@ void sip::PjsuaCommunicator::sendPcmSamples(int16_t *samples, unsigned int lengt
pjsuaLogger.debug("Pushing %d samples to in-buff.", length); pjsuaLogger.debug("Pushing %d samples to in-buff.", length);
pjmedia_circ_buf_write(inputBuff, samples, length); pjmedia_circ_buf_write(inputBuff, samples, length);
} }

4
PjsuaCommunicator.hpp
View File

@ -39,7 +39,7 @@ namespace sip {
mesg += errorMsgBuffer; mesg += errorMsgBuffer;
} }
virtual const char *what() const throw() { virtual const char *what() const throw() override {
return mesg.c_str(); return mesg.c_str();
} }
@ -67,7 +67,7 @@ namespace sip {
~PjsuaCommunicator(); ~PjsuaCommunicator();
virtual void sendPcmSamples(int16_t *samples, unsigned int length); virtual void sendPcmSamples(int16_t *samples, unsigned int length) override;
std::function<void(std::string)> onStateChange; std::function<void(std::string)> onStateChange;