mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed libcontrold dependency

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@336 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-02-14 13:09:07 +00:00
parent e642e6f345
commit 35d7d555b6
15 changed files with 44 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -760,12 +760,15 @@ void CControlAPI::RCEmCGI(CyhookHandler *hh)
//-----------------------------------------------------------------------------
void CControlAPI::AspectRatioCGI(CyhookHandler *hh)
{
#if HAVE_DBOX2 // FIXME: not implemented
hh->printf("%s", NeutrinoAPI->Controld->getAspectRatio() == '\0' ? "4:3" : "16:9");
#endif
}
//-----------------------------------------------------------------------------
void CControlAPI::VideoFormatCGI(CyhookHandler *hh)
{
#if HAVE_DBOX2 // FIXME: not implemented
if (hh->ParamList.empty() || hh->ParamList["1"] == "status") {
hh->WriteLn(NeutrinoAPI->videoformat_names[(unsigned int)NeutrinoAPI->Controld->getVideoFormat()]);
return;
@@ -788,11 +791,14 @@ void CControlAPI::VideoFormatCGI(CyhookHandler *hh)
} else {
hh->SendError();
}
#endif
hh->SendOk();
}
//-----------------------------------------------------------------------------
void CControlAPI::VideoOutputCGI(CyhookHandler *hh)
{
#if HAVE_DBOX2 // FIXME: not implemented
unsigned int videooutput=0;
if (hh->ParamList.empty() || hh->ParamList["1"] == "status") {
hh->WriteLn(NeutrinoAPI->videooutput_names[(unsigned int) NeutrinoAPI->Controld->getVideoOutput()]);
@@ -812,12 +818,14 @@ void CControlAPI::VideoOutputCGI(CyhookHandler *hh)
}
NeutrinoAPI->Controld->setVideoOutput(videooutput);
#endif
hh->SendOk();
}
//-----------------------------------------------------------------------------
void CControlAPI::VCROutputCGI(CyhookHandler *hh)
{
#if HAVE_DBOX2 // FIXME: not implemented
unsigned int vcroutput;
if (hh->ParamList.empty() || hh->ParamList["1"] == "status") {
hh->WriteLn(NeutrinoAPI->videooutput_names[(unsigned char)NeutrinoAPI->Controld->getVCROutput()]);
@@ -840,6 +848,7 @@ void CControlAPI::VCROutputCGI(CyhookHandler *hh)
return;
}
NeutrinoAPI->Controld->setVCROutput(vcroutput);
#endif
hh->SendOk();
return;
@@ -848,6 +857,7 @@ void CControlAPI::VCROutputCGI(CyhookHandler *hh)
//-----------------------------------------------------------------------------
void CControlAPI::ScartModeCGI(CyhookHandler *hh)
{
#if HAVE_DBOX2 // FIXME: not implemented
bool new_status;
if (hh->ParamList.empty() || hh->ParamList["1"] == "status") {
hh->printf(NeutrinoAPI->Controld->getScartMode() ? "on" : "off");
@@ -861,14 +871,20 @@ void CControlAPI::ScartModeCGI(CyhookHandler *hh)
return;
}
NeutrinoAPI->Controld->setScartMode(new_status);
#endif
hh->SendOk();
}
//-------------------------------------------------------------------------
void CControlAPI::VolumeCGI(CyhookHandler *hh)
{
if (hh->ParamList.empty()) //without param: show actual volumen
hh->printf("%d", NeutrinoAPI->Controld->getVolume());
if (hh->ParamList.empty()) { //without param: show actual volumen
unsigned int volume;
NeutrinoAPI->Zapit->getVolume(&volume, &volume);
hh->printf("%d", volume);
//hh->printf("%d", NeutrinoAPI->Controld->getVolume());
}
else if (hh->ParamList["1"].compare("mute") == 0)
{
NeutrinoAPI->Zapit->muteAudio(true);
@@ -883,7 +899,8 @@ void CControlAPI::VolumeCGI(CyhookHandler *hh)
{
hh->Write((char *) (NeutrinoAPI->Controld->getMute() ? "1" : "0")); // mute
}*/
}
*/
else if(hh->ParamList["1"]!="")
{ //set volume
char vol = atol( hh->ParamList["1"].c_str() );
@@ -1546,6 +1563,7 @@ void CControlAPI::SendAllCurrentVAPid(CyhookHandler *hh)
//-----------------------------------------------------------------------------
void CControlAPI::SendSettings(CyhookHandler *hh)
{
#if 0
hh->WriteLn(
"Boxtype " +
NeutrinoAPI->Dbox_Hersteller[NeutrinoAPI->Controld->getBoxType()] +
@@ -1556,6 +1574,7 @@ void CControlAPI::SendSettings(CyhookHandler *hh)
"videoformat " +
NeutrinoAPI->videoformat_names[(unsigned char)NeutrinoAPI->Controld->getVideoFormat()]
);
#endif
}
//-----------------------------------------------------------------------------

6
src/nhttpd/tuxboxapi/neutrinoapi.cpp
View File

@@ -85,7 +85,7 @@ std::string CNeutrinoAPI::audiotype_names[5] = {"none", "single channel","dual
//=============================================================================
CNeutrinoAPI::CNeutrinoAPI()
{
Controld = new CControldClient();
//Controld = new CControldClient();
Sectionsd = new CSectionsdClient();
Zapit = new CZapitClient();
Timerd = new CTimerdClient();
@@ -118,8 +118,8 @@ CNeutrinoAPI::~CNeutrinoAPI(void)
delete NeutrinoYParser;
if (ControlAPI)
delete ControlAPI;
if (Controld)
delete Controld;
//if (Controld)
// delete Controld;
if (Sectionsd)
delete Sectionsd;
if (Zapit)

4
src/nhttpd/tuxboxapi/neutrinoapi.h
View File

@@ -6,7 +6,7 @@
#include <string>
// tuxbox
#include <controldclient/controldclient.h>
//#include <controldclient/controldclient.h>
#include <eventserver.h>
#include <sectionsdclient/sectionsdclient.h>
#include <timerdclient/timerdclient.h>
@@ -28,7 +28,7 @@ bool _initialize_iso639_map(void);
class CNeutrinoAPI
{
// Clientlibs
CControldClient *Controld;
//CControldClient *Controld;
CSectionsdClient *Sectionsd;
CZapitClient *Zapit;
CTimerdClient *Timerd;

5
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
View File

@@ -680,9 +680,10 @@ std::string CNeutrinoYParser::func_get_partition_list(CyhookHandler */*hh*/, st
//-------------------------------------------------------------------------
// y-func : get boxtypetext (Nokia, Philips, Sagem)
//-------------------------------------------------------------------------
std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler */*hh*/, std::string /*para*/)
std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler * /*hh*/, std::string /*para*/)
{
return NeutrinoAPI->Dbox_Hersteller[NeutrinoAPI->Controld->getBoxType()];
return "Coolstream";//FIXME
//return NeutrinoAPI->Dbox_Hersteller[NeutrinoAPI->Controld->getBoxType()];
}
//-------------------------------------------------------------------------
// y-func : get stream info