Skip to content

Commit

Permalink
Fix spaces on end of lines
Browse files Browse the repository at this point in the history
  • Loading branch information
ilya-fedin authored and john-preston committed Jan 21, 2020
1 parent 38bc087 commit debda1a
Show file tree
Hide file tree
Showing 38 changed files with 188 additions and 188 deletions.
2 changes: 1 addition & 1 deletion Buffers.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ namespace tgvoip{
size_t GetLength();
void Reset();
void Rewind(size_t numBytes);

BufferOutputStream& operator=(BufferOutputStream&& other){
if(this!=&other){
if(!bufferProvided && buffer)
Expand Down
2 changes: 1 addition & 1 deletion EchoCanceller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ EchoCanceller::EchoCanceller(bool enableAEC, bool enableNS, bool enableAGC){
config.high_pass_filter.enabled = enableAEC;
config.gain_controller2.enabled = enableAGC;
apm->ApplyConfig(config);

webrtc::NoiseSuppression::Level nsLevel;
#ifdef __APPLE__
switch(ServerConfig::GetSharedInstance()->GetInt("webrtc_ns_level_vpio", 0)){
Expand Down
2 changes: 1 addition & 1 deletion JitterBuffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ void JitterBuffer::PutInternal(jitter_packet_t* pkt, bool overwriteExisting){
first=true;
LOGI("jitter: resyncing, next timestamp = %lld (step=%d, minDelay=%f)", (long long int)nextTimestamp, step, minDelay);
}

for(i=0;i<JITTER_SLOT_COUNT;i++){
if(slots[i].buffer!=NULL){
if(slots[i].timestamp<nextTimestamp-1){
Expand Down
24 changes: 12 additions & 12 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -1755,19 +1755,19 @@ libtgvoip_la_OBJECTS = $(am_libtgvoip_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
am__v_lt_1 =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
am__v_GEN_1 =
am__v_GEN_1 =
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__maybe_remake_depfiles = depfiles
Expand Down Expand Up @@ -2091,7 +2091,7 @@ LTCPPASCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
AM_V_CPPAS = $(am__v_CPPAS_@AM_V@)
am__v_CPPAS_ = $(am__v_CPPAS_@AM_DEFAULT_V@)
am__v_CPPAS_0 = @echo " CPPAS " $@;
am__v_CPPAS_1 =
am__v_CPPAS_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
Expand All @@ -2101,15 +2101,15 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
am__v_CC_1 =
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
am__v_CCLD_1 =
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
Expand All @@ -2119,15 +2119,15 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
AM_V_CXX = $(am__v_CXX_@AM_V@)
am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
am__v_CXX_0 = @echo " CXX " $@;
am__v_CXX_1 =
am__v_CXX_1 =
CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 =
am__v_CXXLD_1 =
OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS)
LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
Expand All @@ -2137,15 +2137,15 @@ LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@)
am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@)
am__v_OBJCXX_0 = @echo " OBJCXX " $@;
am__v_OBJCXX_1 =
am__v_OBJCXX_1 =
OBJCXXLD = $(OBJCXX)
OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@)
am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
am__v_OBJCXXLD_1 =
am__v_OBJCXXLD_1 =
SOURCES = $(libtgvoip_la_SOURCES)
DIST_SOURCES = $(am__libtgvoip_la_SOURCES_DIST)
am__can_run_installinfo = \
Expand Down Expand Up @@ -2419,7 +2419,7 @@ config.h: stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: $(am__configure_deps)
$(srcdir)/config.h.in: $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
Expand Down Expand Up @@ -3529,7 +3529,7 @@ webrtc_dsp/common_audio/signal_processing/complex_bit_reverse.lo: \
webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.lo: webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(am__dirstamp) \
webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(DEPDIR)/$(am__dirstamp)

libtgvoip.la: $(libtgvoip_la_OBJECTS) $(libtgvoip_la_DEPENDENCIES) $(EXTRA_libtgvoip_la_DEPENDENCIES)
libtgvoip.la: $(libtgvoip_la_OBJECTS) $(libtgvoip_la_DEPENDENCIES) $(EXTRA_libtgvoip_la_DEPENDENCIES)
$(AM_V_OBJCXXLD)$(OBJCXXLINK) -rpath $(libdir) $(libtgvoip_la_OBJECTS) $(libtgvoip_la_LIBADD) $(LIBS)

mostlyclean-compile:
Expand Down
2 changes: 1 addition & 1 deletion NetworkSocket.h
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ namespace tgvoip {
virtual uint16_t GetConnectedPort();
virtual bool OnReadyToSend();
virtual bool OnReadyToReceive();

bool NeedSelectForSending();

private:
Expand Down
14 changes: 7 additions & 7 deletions VoIPController.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ namespace tgvoip{
void (*aes_cbc_encrypt)(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv);
void (*aes_cbc_decrypt)(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv);
};

struct CellularCarrierInfo{
std::string name;
std::string mcc;
Expand Down Expand Up @@ -159,9 +159,9 @@ namespace tgvoip{
};

class AudioInputDevice : public AudioDevice{

};

class AudioInputTester{
public:
AudioInputTester(const std::string deviceID);
Expand Down Expand Up @@ -415,14 +415,14 @@ namespace tgvoip{
void (*upgradeToGroupCallRequested)(VoIPController*);
};
void SetCallbacks(Callbacks callbacks);

float GetOutputLevel(){
return 0.0f;
};
int GetVideoResolutionForCurrentBitrate();
void SetVideoSource(video::VideoSource* source);
void SetVideoRenderer(video::VideoRenderer* renderer);

void SetInputVolume(float level);
void SetOutputVolume(float level);
#if defined(__APPLE__) && defined(TARGET_OS_OSX)
Expand Down Expand Up @@ -739,7 +739,7 @@ namespace tgvoip{
uint32_t initTimeoutID=MessageThread::INVALID_ID;
uint32_t noStreamsNopID=MessageThread::INVALID_ID;
uint32_t udpPingTimeoutID=MessageThread::INVALID_ID;

effects::Volume outputVolume;
effects::Volume inputVolume;

Expand All @@ -756,7 +756,7 @@ namespace tgvoip{
#if defined(__APPLE__) && defined(TARGET_OS_OSX)
bool macAudioDuckingEnabled=true;
#endif

video::VideoSource* videoSource=NULL;
video::VideoRenderer* videoRenderer=NULL;
double firstVideoFrameTime=0.0;
Expand Down
8 changes: 4 additions & 4 deletions audio/AudioIO.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace tgvoip{
bool failed=false;
std::string error;
};

template<class I, class O> class ContextlessAudioIO : public AudioIO{
public:
ContextlessAudioIO(){
Expand All @@ -42,16 +42,16 @@ namespace tgvoip{
input=new I(inputDeviceID);
output=new O(outputDeviceID);
}

virtual ~ContextlessAudioIO(){
delete input;
delete output;
}

virtual AudioInput* GetInput(){
return input;
}

virtual AudioOutput* GetOutput(){
return output;
}
Expand Down
4 changes: 2 additions & 2 deletions audio/AudioIOCallback.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace tgvoip{
Thread* thread;
std::function<void(int16_t*, size_t)> dataCallback;
};

class AudioOutputCallback : public AudioOutput{
public:
AudioOutputCallback();
Expand All @@ -44,7 +44,7 @@ namespace tgvoip{
Thread* thread;
std::function<void(int16_t*, size_t)> dataCallback;
};

class AudioIOCallback : public AudioIO{
public:
AudioIOCallback();
Expand Down
2 changes: 1 addition & 1 deletion audio/AudioInput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ std::string AudioInput::GetCurrentDevice(){
}

void AudioInput::SetCurrentDevice(std::string deviceID){

}

int32_t AudioInput::GetEstimatedDelay(){
Expand Down
2 changes: 1 addition & 1 deletion audio/AudioInput.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace tgvoip{

class AudioInputDevice;
class AudioOutputDevice;

namespace audio{
class AudioInput : public MediaStreamItf{
public:
Expand Down
2 changes: 1 addition & 1 deletion audio/AudioOutput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ std::string AudioOutput::GetCurrentDevice(){
}

void AudioOutput::SetCurrentDevice(std::string deviceID){

}

bool AudioOutput::IsInitialized(){
Expand Down
2 changes: 1 addition & 1 deletion audio/AudioOutput.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace tgvoip{

class AudioInputDevice;
class AudioOutputDevice;

namespace audio{
class AudioOutput : public MediaStreamItf{
public:
Expand Down
2 changes: 1 addition & 1 deletion libtgvoip.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@
'<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/vad_core.c',
'<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/vad_sp.h',
'<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/vad_filterbank.h',
'<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/vad_gmm.c',
'<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/vad_gmm.c',

# ARM/NEON sources
# TODO check if there's a good way to make these compile with ARM ports of TDesktop
Expand Down
2 changes: 1 addition & 1 deletion os/android/VideoRendererAndroid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void VideoRendererAndroid::Reset(uint32_t codec, unsigned int width, unsigned in
Request::Type::UpdateStreamState
};
queue.Put(std::move(req2));

if(!thread){
thread=new Thread(std::bind(&VideoRendererAndroid::RunThread, this));
thread->Start();
Expand Down
2 changes: 1 addition & 1 deletion os/darwin/AudioInputAudioUnit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ AudioInputAudioUnit::AudioInputAudioUnit(std::string deviceID, AudioUnitIO* io){
}

AudioInputAudioUnit::~AudioInputAudioUnit(){

}

void AudioInputAudioUnit::Start(){
Expand Down
Loading

0 comments on commit debda1a

Please sign in to comment.