Skip to content

Commit

Permalink
添加引擎代码。
Browse files Browse the repository at this point in the history
  • Loading branch information
@prudens
prudens committed Nov 10, 2017
1 parent e677421 commit 45d03a0
Show file tree
Hide file tree
Showing 34 changed files with 181 additions and 62 deletions.
28 changes: 21 additions & 7 deletions outsource/real_audio_client/real_audio_client.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,15 @@
<ClCompile Include="..\user_service.pb.cc" />
<ClCompile Include="src\api\audio_typedef.cpp" />
<ClCompile Include="src\api\module_debug_impl.cpp" />
<ClCompile Include="src\api\snail_audio_engine_impl.cpp" />
<ClCompile Include="src\api\audio_engine_impl.cpp" />
<ClCompile Include="src\engine_core\audio_engine_core.cpp" />
<ClCompile Include="src\engine_core\audio_mixer.cpp" />
<ClCompile Include="src\engine_core\audio_neteq.cpp" />
<ClCompile Include="src\engine_core\audio_processing.cpp" />
<ClCompile Include="src\engine_core\codec_conveter.cpp" />
<ClCompile Include="src\engine_core\music_channel.cpp" />
<ClCompile Include="src\engine_core\voice_chat_channel.cpp" />
<ClCompile Include="src\engine_core\voice_message_channel.cpp" />
<ClCompile Include="src\sdk\audio_error.cpp" />
<ClCompile Include="src\sdk\client_module.cpp" />
<ClCompile Include="src\sdk\master_control.cpp" />
Expand All @@ -41,13 +49,19 @@
<ClInclude Include="..\user_service.pb.h" />
<ClInclude Include="src\api\audio_typedef.h" />
<ClInclude Include="src\api\IModuleDebuger.h" />
<ClInclude Include="src\api\IModuleDebuger_OC.h" />
<ClInclude Include="src\api\ISnailAudioEngine.h" />
<ClInclude Include="src\api\ISnailAudioModule.h" />
<ClInclude Include="src\api\IAudioEngine.h" />
<ClInclude Include="src\api\IAudioModule.h" />
<ClInclude Include="src\api\module_debug_impl.h" />
<ClInclude Include="src\api\SnailAudioEngineHelper.h" />
<ClInclude Include="src\api\SnailAudioEngine_OC.h" />
<ClInclude Include="src\api\snail_audio_engine_impl.h" />
<ClInclude Include="src\api\AudioEngineHelper.h" />
<ClInclude Include="src\api\audio_engine_impl.h" />
<ClInclude Include="src\engine_core\audio_engine_core.h" />
<ClInclude Include="src\engine_core\audio_mixer.h" />
<ClInclude Include="src\engine_core\audio_neteq.h" />
<ClInclude Include="src\engine_core\audio_processing.h" />
<ClInclude Include="src\engine_core\codec_conveter.h" />
<ClInclude Include="src\engine_core\music_channel.h" />
<ClInclude Include="src\engine_core\voice_chat_channel.h" />
<ClInclude Include="src\engine_core\voice_message_channel.h" />
<ClInclude Include="src\sdk\audio_error.h" />
<ClInclude Include="src\sdk\client_module.h" />
<ClInclude Include="src\sdk\master_control.h" />
Expand Down
84 changes: 63 additions & 21 deletions outsource/real_audio_client/real_audio_client.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
<ClCompile Include="src\api\module_debug_impl.cpp">
<Filter>api</Filter>
</ClCompile>
<ClCompile Include="src\api\snail_audio_engine_impl.cpp">
<Filter>api</Filter>
</ClCompile>
<ClCompile Include="src\sdk\audio_error.cpp">
<Filter>sdk</Filter>
</ClCompile>
Expand Down Expand Up @@ -64,6 +61,33 @@
<ClCompile Include="..\user_service.pb.cc">
<Filter>sdk</Filter>
</ClCompile>
<ClCompile Include="src\engine_core\audio_engine_core.cpp">
<Filter>engine_core</Filter>
</ClCompile>
<ClCompile Include="src\engine_core\audio_mixer.cpp">
<Filter>engine_core</Filter>
</ClCompile>
<ClCompile Include="src\engine_core\audio_processing.cpp">
<Filter>engine_core</Filter>
</ClCompile>
<ClCompile Include="src\engine_core\codec_conveter.cpp">
<Filter>engine_core</Filter>
</ClCompile>
<ClCompile Include="src\engine_core\music_channel.cpp">
<Filter>engine_core</Filter>
</ClCompile>
<ClCompile Include="src\engine_core\voice_chat_channel.cpp">
<Filter>engine_core</Filter>
</ClCompile>
<ClCompile Include="src\engine_core\voice_message_channel.cpp">
<Filter>engine_core</Filter>
</ClCompile>
<ClCompile Include="src\engine_core\audio_neteq.cpp">
<Filter>engine_core</Filter>
</ClCompile>
<ClCompile Include="src\api\audio_engine_impl.cpp">
<Filter>api</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\api\audio_typedef.h">
Expand All @@ -72,27 +96,9 @@
<ClInclude Include="src\api\IModuleDebuger.h">
<Filter>api</Filter>
</ClInclude>
<ClInclude Include="src\api\IModuleDebuger_OC.h">
<Filter>api</Filter>
</ClInclude>
<ClInclude Include="src\api\ISnailAudioEngine.h">
<Filter>api</Filter>
</ClInclude>
<ClInclude Include="src\api\ISnailAudioModule.h">
<Filter>api</Filter>
</ClInclude>
<ClInclude Include="src\api\module_debug_impl.h">
<Filter>api</Filter>
</ClInclude>
<ClInclude Include="src\api\snail_audio_engine_impl.h">
<Filter>api</Filter>
</ClInclude>
<ClInclude Include="src\api\SnailAudioEngine_OC.h">
<Filter>api</Filter>
</ClInclude>
<ClInclude Include="src\api\SnailAudioEngineHelper.h">
<Filter>api</Filter>
</ClInclude>
<ClInclude Include="src\sdk\audio_error.h">
<Filter>sdk</Filter>
</ClInclude>
Expand Down Expand Up @@ -144,6 +150,42 @@
<ClInclude Include="..\user_service.pb.h">
<Filter>sdk</Filter>
</ClInclude>
<ClInclude Include="src\engine_core\audio_engine_core.h">
<Filter>engine_core</Filter>
</ClInclude>
<ClInclude Include="src\engine_core\audio_mixer.h">
<Filter>engine_core</Filter>
</ClInclude>
<ClInclude Include="src\engine_core\audio_processing.h">
<Filter>engine_core</Filter>
</ClInclude>
<ClInclude Include="src\engine_core\codec_conveter.h">
<Filter>engine_core</Filter>
</ClInclude>
<ClInclude Include="src\engine_core\music_channel.h">
<Filter>engine_core</Filter>
</ClInclude>
<ClInclude Include="src\engine_core\voice_chat_channel.h">
<Filter>engine_core</Filter>
</ClInclude>
<ClInclude Include="src\engine_core\voice_message_channel.h">
<Filter>engine_core</Filter>
</ClInclude>
<ClInclude Include="src\engine_core\audio_neteq.h">
<Filter>engine_core</Filter>
</ClInclude>
<ClInclude Include="src\api\IAudioModule.h">
<Filter>api</Filter>
</ClInclude>
<ClInclude Include="src\api\IAudioEngine.h">
<Filter>api</Filter>
</ClInclude>
<ClInclude Include="src\api\AudioEngineHelper.h">
<Filter>api</Filter>
</ClInclude>
<ClInclude Include="src\api\audio_engine_impl.h">
<Filter>api</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="api">
Expand Down
0 ...o_client/src/api/SnailAudioEngineHelper.h → ..._audio_client/src/api/AudioEngineHelper.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ..._audio_client/src/api/ISnailAudioEngine.h → .../real_audio_client/src/api/IAudioEngine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define INTERFACE_SNAIL_AUDIO_ENGINE_H
#pragma once

#include "SnailAudioEngineHelper.h"
#include "AudioEngineHelper.h"

extern "C"
{
Expand Down
2 changes: 1 addition & 1 deletion ...udio_client/src/api/SnailAudioEngine_OC.h → ...al_audio_client/src/api/IAudioEngine_OC.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#ifndef SNAIL_AUDIO_ENGINE_OC_H
#define SNAIL_AUDIO_ENGINE_OC_H
#import <Foundation/Foundation.h>
#include "SnailAudioEngineHelper.h"
#include "AudioEngineHelper.h"
#ifdef __cplusplus
extern "C"{
#endif
Expand Down
2 changes: 1 addition & 1 deletion ..._audio_client/src/api/ISnailAudioModule.h → .../real_audio_client/src/api/IAudioModule.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef SNAIL_AUDIO_MODULE_H
#define SNAIL_AUDIO_MODULE_H
#pragma once
#include "SnailAudioEngineHelper.h"
#include "AudioEngineHelper.h"
namespace audio_engine{

class IUserEventHandler
Expand Down
4 changes: 2 additions & 2 deletions outsource/real_audio_client/src/api/IModuleDebuger.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
////仅供内部开发人员调试使用
////仅供内部开发人员调试使用


#ifndef INTERFACE_MODULE_DEBUG_H
#define INTERFACE_MODULE_DEBUG_H
#pragma once

#include "ISnailAudioEngine.h"
#include "IAudioEngine.h"

namespace audio_engine{

Expand Down
2 changes: 1 addition & 1 deletion ...lient/src/api/snail_audio_engine_impl.cpp → ...udio_client/src/api/audio_engine_impl.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#include <memory>
//#include "system/system.h"
#include "snail_audio_engine_impl.h"
#include "audio_engine_impl.h"
#include "module_debug_impl.h"
#include "audio_typedef.h"

Expand Down
4 changes: 2 additions & 2 deletions ..._client/src/api/snail_audio_engine_impl.h → ..._audio_client/src/api/audio_engine_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <mutex>
#include <map>
#include "../sdk/master_control.h"
#include "ISnailAudioModule.h"
#include "ISnailAudioEngine.h"
#include "IAudioModule.h"
#include "IAudioEngine.h"

namespace audio_engine{

Expand Down
2 changes: 1 addition & 1 deletion outsource/real_audio_client/src/api/audio_typedef.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//#include "media_base_client/imedia_base_client.h"
#include "SnailAudioEngineHelper.h"
#include "AudioEngineHelper.h"
#include "audio_typedef.h"
//#include "system/media_error_code.h"

Expand Down
2 changes: 1 addition & 1 deletion outsource/real_audio_client/src/api/audio_typedef.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include<memory>
#include <vector>
#include <string>
#include "SnailAudioEngineHelper.h"
#include "AudioEngineHelper.h"
#include "user_service.pb.h"
#include "../sdk/user_list.h"
namespace audio_engine{
Expand Down
2 changes: 1 addition & 1 deletion outsource/real_audio_client/src/api/module_debug_impl.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once
//#include "media_base_client/imedia_base_client.h"
#include "IModuleDebuger.h"
#include "snail_audio_engine_impl.h"
#include "audio_engine_impl.h"


namespace audio_engine{
Expand Down
Empty file added outsource/real_audio_client/src/engine_core/audio_engine_core.cpp
View file
Empty file.
10 changes: 10 additions & 0 deletions outsource/real_audio_client/src/engine_core/audio_engine_core.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#pragma once
namespace audio_engine
{
class AudioEngineCore
{
public:
AudioEngineCore();
AudioEngineCore();
};
}
Empty file added outsource/real_audio_client/src/engine_core/audio_mixer.cpp
View file
Empty file.
9 changes: 9 additions & 0 deletions outsource/real_audio_client/src/engine_core/audio_mixer.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#pragma once
namespace audio_engine
{
class AudioMixer
{
public:
AudioMixer();
};
}
Empty file added outsource/real_audio_client/src/engine_core/audio_neteq.cpp
View file
Empty file.
6 changes: 6 additions & 0 deletions outsource/real_audio_client/src/engine_core/audio_neteq.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#pragma once
namespace audio_engine{
class AudioNetEq{

};
}
Empty file added outsource/real_audio_client/src/engine_core/audio_processing.cpp
View file
Empty file.
7 changes: 7 additions & 0 deletions outsource/real_audio_client/src/engine_core/audio_processing.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#pragma once
namespace audio_engine{
class AduioProcessing
{

};
}
Empty file added outsource/real_audio_client/src/engine_core/codec_conveter.cpp
View file
Empty file.
7 changes: 7 additions & 0 deletions outsource/real_audio_client/src/engine_core/codec_conveter.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#pragma once
namespace audio_engine{
class CodecConveter
{

};
}
Empty file added outsource/real_audio_client/src/engine_core/music_channel.cpp
View file
Empty file.
8 changes: 8 additions & 0 deletions outsource/real_audio_client/src/engine_core/music_channel.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#pragma once
namespace audio_engine
{
class MusicChannel
{

};
}
Empty file added outsource/real_audio_client/src/engine_core/voice_chat_channel.cpp
View file
Empty file.
8 changes: 8 additions & 0 deletions outsource/real_audio_client/src/engine_core/voice_chat_channel.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#pragma once
namespace audio_engine
{
class VoiceChatChannel
{

};
}
Empty file added outsource/real_audio_client/src/engine_core/voice_message_channel.cpp
View file
Empty file.
8 changes: 8 additions & 0 deletions outsource/real_audio_client/src/engine_core/voice_message_channel.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#pragma once
namespace audio_engine
{
class VoiceMessageChannel
{

};
}
2 changes: 1 addition & 1 deletion outsource/real_audio_client/src/sdk/master_control.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "master_control.h"
#include <boost/signals2.hpp>
#include "base/log.h"
#include "SnailAudioEngineHelper.h"
#include "AudioEngineHelper.h"
namespace audio_engine{
static audio_engine::Logger Log;
MasterControl::MasterControl()
Expand Down
2 changes: 1 addition & 1 deletion outsource/real_audio_client/src/sdk/user_manager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "base/timer.h"
#include "user_service.pb.h"
#include "base/log.h"
#include "SnailAudioEngineHelper.h"
#include "AudioEngineHelper.h"
namespace audio_engine{
using namespace std::chrono;
static audio_engine::Logger Log;
Expand Down
4 changes: 2 additions & 2 deletions outsource/real_audio_client/src/ui/audio_client.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once
#include "message_queue.h"
#include "api/ISnailAudioEngine.h"
#include "api/ISnailAudioModule.h"
#include "api/IAudioEngine.h"
#include "api/IAudioModule.h"
#include <vector>
namespace audio_engine
{
Expand Down
Loading

0 comments on commit 45d03a0

Please sign in to comment.