Skip to content

Commit

Permalink
delete print_line and unused functions
Browse files Browse the repository at this point in the history
  • Loading branch information
hungrymonkey committed Oct 8, 2017
1 parent 27f1ab2 commit 2d2b0a0
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 40 deletions.
5 changes: 1 addition & 4 deletions modules/mumble/callback.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@ void SimpleCallback::MyCallBack::audio( int target,
int16_t *pcm_data,
uint32_t pcm_data_size){
if(!_cb._audio_handler.is_null()){
// Variant tar(target);
Variant sid(sessionId);
Variant snum(sequenceNumber);
Ref<AudioStreamSample> sam = Ref<AudioStreamSample>(utils::pcm2Sample(pcm_data, pcm_data_size));
Variant pcm(sam);
print_line("sample is class : " + sam->get_class());
// Variant pcm(utils::pcm2ByteArray(pcm_data,pcm_data_size));

Variant::CallError err;
const Variant *args[3] = { &sid, &snum, &pcm};
Variant result = _cb._audio_handler->call_func( args, 3, err);
Expand All @@ -36,7 +34,6 @@ void SimpleCallback::MyCallBack::textMessage(
std::vector<uint32_t> tree_id,
std::string message) {
if(!_cb._text_handler.is_null()){
print_line("internal message: " + String(message.c_str()) );
Variant s = utils::cpp_uint32vec2Variant(session);
Variant c = utils::cpp_uint32vec2Variant(channel_id);
Variant t = utils::cpp_uint32vec2Variant(tree_id);
Expand Down
16 changes: 0 additions & 16 deletions modules/mumble/mumble.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ void Mumble::_PrivateMumble::engage(String host, int port, String user, String p
}

void Mumble::_PrivateMumble::sendText(const String text){
print_line("i am sending this message: " + text);
_mum.sendTextMessage( utils::gstr2cpp_str(text) );
}

Expand Down Expand Up @@ -70,22 +69,7 @@ void Mumble::setCallback( Ref<SimpleCallback> cb){
void Mumble::sendText(const String text){
_pMumble -> sendText( text );
}
/*
void Mumble::sendAudio(PoolByteArray sample){
uint32_t pcm_len = sample.size()/2;
int16_t pcm[5000];
if( pcm_len > 0){
for(int i = 0; i < pcm_len; i++){
uint16_t low = (uint16_t) sample[2*i];
uint16_t hi = (uint16_t) sample[2*i+1];
pcm[i] = ( low | ( hi << 8));
}
print_line( "sendaudio: pcm value at 500: " + itos(sample[1000])+ " " + itos(sample[1001]));

_mum->sendAudioData(pcm, pcm_len);
}
}
*/
void Mumble::sendAudio(Ref<AudioStreamSample> sample){

const PoolByteArray data = sample->get_data();
Expand Down
20 changes: 1 addition & 19 deletions modules/mumble/utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,7 @@ Variant utils::cpp_uint32vec2Variant( const std::vector<uint32_t> &v ){
return ret;
}

PoolByteArray utils::pcm2ByteArray( const int16_t * pcm_data, uint32_t size){
PoolByteArray d;
d.resize(size * 2);

for( int i=0; i < size; i++){
uint16_t sh = (uint16_t) pcm_data[i];
d.set( i*2, (uint8_t) (sh & 0xFF) );
d.set( i*2+1, (uint8_t) (sh >> 8));
}
print_line( "utils: pcm value at 500: " + itos(pcm_data[500]));

print_line( "utils: pcm value at 500: " + itos(d[1000])+ " " + itos(d[1001]));

return d;
}
AudioStreamSample *utils::pcm2Sample( const int16_t * pcm_data, uint32_t size){
PoolByteArray d;
d.resize(size * 2);
Expand All @@ -47,12 +33,8 @@ AudioStreamSample *utils::pcm2Sample( const int16_t * pcm_data, uint32_t size){
d.set( i*2 , (uint8_t) (sh & 0xFF) );
d.set( i*2+1 , (uint8_t) (sh >> 8));
}
print_line( "utils: pcm value at 500: " + itos(pcm_data[500]));
print_line( "utils: pcm value at 700: " + itos(pcm_data[700]));
print_line( "utils: pcm value at 500: " + itos(d[1000])+ " " + itos(d[1001]));
print_line( "before audiostreamsample-set_data: pcm value at 700: " + itos(d[1400])+ " " + itos(d[1401]));


sam->set_data(d);
print_line( "after audiostreamsample-set_data: pcm value at 500: " + itos(sam->get_data()[1000])+ " " + itos(sam->get_data()[1001]));
return sam;
}
1 change: 0 additions & 1 deletion modules/mumble/utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ namespace utils{
std::string gstr2cpp_str(String s);
String cpp_str2gstr(std::string s);
Variant cpp_uint32vec2Variant( const std::vector<uint32_t> &v );
PoolByteArray pcm2ByteArray( const int16_t * pcm_data, uint32_t size);
AudioStreamSample *pcm2Sample( const int16_t * pcm_data, uint32_t size);
}

0 comments on commit 2d2b0a0

Please sign in to comment.