danog/php-libtgvoip
1
0
Fork 0
mirror of https://github.com/danog/php-libtgvoip.git synced 2024-11-26 20:04:48 +01:00
Code Issues Projects Releases Wiki Activity

Moar fixes

Browse Source
This commit is contained in:
Daniil Gentili 2019-03-29 20:00:38 +01:00
parent 6fe1626822
commit 7b86455bf2
2 changed files with 8 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
main.cpp
View File

@ -345,7 +345,7 @@ void VoIP::parseConfig()
if (self["configuration"]["shared_config"])
{
Php::Value shared_config = self["configuration"]["shared_config"];
ServerConfig::GetSharedInstance()->Update(Php::call("json_encode", Php::call("array_merge", VoIPServerConfig::getDefault(), shared_config)));
ServerConfig::GetSharedInstance()->Update(Php::call("json_encode", Php::call("array_merge", Php::call("\\danog\\MadelineProto\\VoIPServerConfig::getFinal"), shared_config)));
}
inst->SetConfig(cfg);
@ -551,32 +551,11 @@ Php::Value VoIP::isPlaying()
return playing;
}
void VoIPServerConfig::update(Php::Parameters &params)
void VoIPServerConfigInternal::update(Php::Parameters &params)
{
Php::Value copyCustom = params[0];
config = copyCustom;
ServerConfig::GetSharedInstance()->Update(Php::call("json_encode", Php::call("array_merge", configDefault, config)));
Php::Array settings = params[0];
ServerConfig::GetSharedInstance()->Update(Php::call("json_encode", settings));
}
Php::Value VoIPServerConfig::get()
{
return config;
}
void VoIPServerConfig::updateDefault(Php::Parameters &params)
{
Php::Value copyDefault = params[0];
configDefault = copyDefault;
ServerConfig::GetSharedInstance()->Update(Php::call("json_encode", Php::call("array_merge", configDefault, config)));
}
Php::Value VoIPServerConfig::getDefault()
{
return configDefault;
}
extern "C"
{
@ -593,12 +572,8 @@ extern "C"
// for the entire duration of the process (that's why it's static)
static Php::Extension extension("php-libtgvoip", "1.1.2");
Php::Class<VoIP> voipServerConfig("VoIPServerConfig");
voipServerConfig.method<&VoIPServerConfig::update>("update", Php::Public);
voipServerConfig.method<&VoIPServerConfig::get>("get", Php::Public);
voipServerConfig.method<&VoIPServerConfig::updateDefault>("updateDefault", Php::Public);
voipServerConfig.method<&VoIPServerConfig::getDefault>("getDefault", Php::Public);
Php::Class<VoIPServerConfigInternal> voipServerConfigInternal("VoIPServerConfigInternal");
voipServerConfigInternal.method<&VoIPServerConfigInternal::update>("updateInternal", Php::Protected | Php::Static, {Php::ByVal("config", Php::Type::Array)});
// description of the class so that PHP knows which methods are accessible
Php::Class<VoIP> voip("VoIP");
@ -710,7 +685,7 @@ extern "C"
Php::Namespace danog("danog");
Php::Namespace MadelineProto("MadelineProto");
MadelineProto.add(move(voipServerConfig));
MadelineProto.add(move(voipServerConfigInternal));
MadelineProto.add(move(voip));
danog.add(move(MadelineProto));
extension.add(move(danog));

8
main.h
View File

@ -73,16 +73,10 @@ class AudioOutputModule;
}
class VoIPServerConfig : public Php::Base
class VoIPServerConfigInternal : public Php::Base
{
public:
static void update(Php::Parameters &params);
static Php::Value get();
static void updateDefault(Php::Parameters &params);
static Php::Value getDefault();
private:
static Php::Array config;
static Php::Array configDefault;
};
class VoIP : public Php::Base