Read about our upcoming Code of Conduct on this issue

This instance will be upgraded to Heptapod 0.28.1 on 2022-01-26 at 16:00 UTC+1 (a few minutes of down time)

Commit fb15c7ed authored by Aleksandr Bakhshiev's avatar Aleksandr Bakhshiev
Browse files

Library was separated into two parts: "library" and "application".

--HG--
branch : NewCore
parent 5cd55a9f4f68
......@@ -963,12 +963,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
</Deployment>
</BorlandProject>
......
#include "UChannelProfiler.h"
#include "../../Deploy/Include/rdk_cpp_initdll.h"
#include "UIVisualController.h"
namespace RDK {
......
......@@ -3,6 +3,9 @@
#include "UEngineControl.h"
#include "UEngineStateThread.h"
#include "UEngineControlThread.h"
#include "UChannelProfiler.h"
#include "UBroadcasterInterface.h"
#include "../../Deploy/Include/rdk_cpp_initdll.h"
namespace RDK {
......
......@@ -2,6 +2,7 @@
#define UENGINE_CONTROL_H
#include "UEngineControlThread.h"
#include "UIVisualController.h"
//#include <boost/asio.hpp>
//#include <boost/chrono.hpp>
......
......@@ -2,6 +2,9 @@
#define UENGINE_CONTROL_THREAD_CPP
#include "UEngineControlThread.h"
#include "UEngineControl.h"
#include "UChannelProfiler.h"
#include "UBroadcasterInterface.h"
#include "../../Deploy/Include/rdk_cpp_initdll.h"
#ifdef WIN32
......
......@@ -8,41 +8,6 @@
namespace RDK {
//
RDK::UBitmapFontCollection GlobalFonts;
//RDK::UELockVar<RDK::UBitmapFontCollection> GlobalFonts;
//
void ClearClobalFonts(void)
{
GlobalFonts.DelAllFonts();
}
//
bool AddGlobalFont(const std::string &font_file_name)
{
RDK::UBitmapFont font;
std::size_t dir_sep_pos=font_file_name.find_last_of("\\/");
std::string font_name;
if(dir_sep_pos != string::npos)
font_name=font_file_name.substr(dir_sep_pos+1);
else
font_name=font_file_name;
std::size_t _pos=font_name.find_first_of("_");
std::size_t _pos2=font_name.find_first_not_of("0123456789",_pos+1);
if(_pos != std::string::npos)
{
std::string font_string_size=font_name.substr(_pos+1,_pos2-_pos-1);
int size=RDK::atoi(font_string_size);
if(!font.LoadFromFile(font_name.substr(0,_pos),font_file_name,size))
return false;
return RDK::GlobalFonts.AddFont(font.GetName(),size,font);
}
return false;
}
// -
// ,
std::vector<RDK::UIVisualController*> UIVisualControllerStorage::InterfaceUpdaters;
......
......@@ -6,6 +6,7 @@
#include "../../Deploy/Include/myrdk.h"
#include "URpcDecoderCommon.h"
#include "URpcCommandInternal.h"
#include "UApplication.h"
namespace RDK {
......
#include "UServerControl.h"
#include "../../Deploy/Include/rdk_cpp_initdll.h"
#include "UProject.h"
#include "UApplication.h"
namespace RDK {
......
......@@ -2,6 +2,7 @@
#define UServerControlH
#include "../../Deploy/Include/rdk.h"
#include "UIVisualController.h"
namespace RDK {
......
......@@ -39,9 +39,8 @@
#include "../../Core/Graphics/UDrawEngine.h"
#include "../../Core/Graphics/UGraphicsXMLSerialize.h"
#include "../../Core/Graphics/UGraphicsBinarySerialize.h"
//#include "../../Core/Graphics/UBPtzCamera.h"
#include "../../Core/Application/UApplication.h"
//#include "../../Core/Application/UApplication.h"
#endif
#ifndef RDK_APPLICATION_H
#define RDK_APPLICATION_H
#include "rdk_cpp_initdll.h"
#include "../../Core/Application/UApplication.h"
#endif
......@@ -4,5 +4,6 @@
//#include "rdk.h"
#include "rdk_initdll.h"
#include "rdk_cpp_init.h"
//#include "../../Core/Application/UApplication.h"
#endif
......@@ -7,6 +7,43 @@
//#include "rdk_rpc.cpp"
#include "rdk_engine_support.h"
namespace RDK {
//
RDK::UBitmapFontCollection GlobalFonts;
//
void ClearClobalFonts(void)
{
GlobalFonts.DelAllFonts();
}
//
bool AddGlobalFont(const std::string &font_file_name)
{
RDK::UBitmapFont font;
std::size_t dir_sep_pos=font_file_name.find_last_of("\\/");
std::string font_name;
if(dir_sep_pos != std::string::npos)
font_name=font_file_name.substr(dir_sep_pos+1);
else
font_name=font_file_name;
std::size_t _pos=font_name.find_first_of("_");
std::size_t _pos2=font_name.find_first_not_of("0123456789",_pos+1);
if(_pos != std::string::npos)
{
std::string font_string_size=font_name.substr(_pos+1,_pos2-_pos-1);
int size=RDK::atoi(font_string_size);
if(!font.LoadFromFile(font_name.substr(0,_pos),font_file_name,size))
return false;
return RDK::GlobalFonts.AddFont(font.GetName(),size,font);
}
return false;
}
}
// --------------------------------------
//
// --------------------------------------
......
......@@ -7,7 +7,7 @@
#include <Vcl.Controls.hpp>
#include <Vcl.StdCtrls.hpp>
#include <Vcl.Forms.hpp>
#include "../../Deploy/Include/myrdk.h"
#include "../../Deploy/Include/rdk_application.h"
//---------------------------------------------------------------------------
#pragma warn -8130
......
......@@ -8,10 +8,10 @@
#include <Vcl.StdCtrls.hpp>
#include <Vcl.Forms.hpp>
#include <string>
#include "../../Deploy/Include/rdk_cpp_initdll.h"
#include "../../Deploy/Include/rdk_application.h"
//---------------------------------------------------------------------------
#pragma warn -8130
class TUVisualControllerFrame : public TFrame, public RDK::UIVisualController
class TUVisualControllerFrame: public TFrame, public RDK::UIVisualController
{
__published: // IDE-managed Components
private: // User declarations
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment