fix: consoles & dpad being binded to 2 settings
This commit is contained in:
1 parent
02da402490
commit
fed6871356
150 files changed
+19314
-431
No files matched your search
@@ -44,9 +44,11 @@ bool SonyCommerce_Orbis::m_bLicenseChecked=false; // Check the trial/
|
||||
|
||||
|
||||
|
||||
#if 0
|
||||
sce::Toolkit::NP::Utilities::Future<std::vector<sce::Toolkit::NP::ProductInfo> > g_productList;
|
||||
sce::Toolkit::NP::Utilities::Future<sce::Toolkit::NP::CategoryInfo> g_categoryInfo;
|
||||
sce::Toolkit::NP::Utilities::Future<sce::Toolkit::NP::ProductInfoDetailed> g_detailedProductInfo;
|
||||
#endif
|
||||
|
||||
|
||||
SonyCommerce_Orbis::ProductInfoDetailed s_trialUpgradeProductInfoDetailed;
|
||||
@@ -180,19 +182,8 @@ int SonyCommerce_Orbis::getProductList(std::vector<ProductInfo>* productList, ch
|
||||
params.serviceLabel = 0;
|
||||
app.DebugPrintf("Getting Product List ...\n");
|
||||
|
||||
ret = sce::Toolkit::NP::Commerce::Interface::getProductList(&g_productList, params, true);
|
||||
if (ret < 0)
|
||||
{
|
||||
app.DebugPrintf("CommerceInterface::getProductList() error. ret = 0x%x\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (g_productList.hasResult())
|
||||
{
|
||||
// result has returned immediately (don't think this should happen, but was handled in the samples
|
||||
copyProductList(productList, g_productList.get());
|
||||
m_event = e_event_commerceGotProductList;
|
||||
}
|
||||
app.DebugPrintf("getProductList STUB\n");
|
||||
ret = -1;
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -239,21 +230,8 @@ int SonyCommerce_Orbis::getCategoryInfo(CategoryInfo *pInfo, char *categoryId)
|
||||
strcpy(params.categoryId, "");//categoryId);
|
||||
params.serviceLabel = 0;
|
||||
|
||||
app.DebugPrintf("Getting Category Information...\n");
|
||||
|
||||
ret = sce::Toolkit::NP::Commerce::Interface::getCategoryInfo(&g_categoryInfo, params, true);
|
||||
if (ret < 0)
|
||||
{
|
||||
// error
|
||||
app.DebugPrintf("Commerce::Interface::getCategoryInfo error: 0x%x\n", ret);
|
||||
return ret;
|
||||
}
|
||||
else if (g_categoryInfo.hasResult())
|
||||
{
|
||||
// result has returned immediately (don't think this should happen, but was handled in the samples
|
||||
copyCategoryInfo(pInfo, g_categoryInfo.get());
|
||||
m_event = e_event_commerceGotCategoryInfo;
|
||||
}
|
||||
app.DebugPrintf("getCategoryInfo STUB\n");
|
||||
ret = -1;
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -288,21 +266,9 @@ int SonyCommerce_Orbis::getDetailedProductInfo(ProductInfoDetailed *pInfo, const
|
||||
strcpy(params.categoryId, categoryId);
|
||||
strcpy(params.productId, productId);
|
||||
|
||||
app.DebugPrintf("getDetailedProductInfo STUB\n");
|
||||
ret = -1;
|
||||
|
||||
app.DebugPrintf("Getting Detailed Product Information ... \n");
|
||||
ret = sce::Toolkit::NP::Commerce::Interface::getDetailedProductInfo(&g_detailedProductInfo, params, true);
|
||||
if (ret < 0)
|
||||
{
|
||||
app.DebugPrintf("CommerceInterface::getDetailedProductInfo() error. ret = 0x%x\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (g_detailedProductInfo.hasResult())
|
||||
{
|
||||
// result has returned immediately (don't think this should happen, but was handled in the samples
|
||||
copyDetailedProductInfo(pInfo, g_detailedProductInfo.get());
|
||||
m_event = e_event_commerceGotDetailedProductInfo;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -338,20 +304,9 @@ int SonyCommerce_Orbis::addDetailedProductInfo(ProductInfo *pInfo, const char *p
|
||||
strcpy(params.categoryId, categoryId);
|
||||
strcpy(params.productId, productId);
|
||||
|
||||
app.DebugPrintf("addDetailedProductInfo STUB\n");
|
||||
ret = -1;
|
||||
|
||||
app.DebugPrintf("Getting Detailed Product Information ... \n");
|
||||
ret = sce::Toolkit::NP::Commerce::Interface::getDetailedProductInfo(&g_detailedProductInfo, params, true);
|
||||
if (ret < 0)
|
||||
{
|
||||
app.DebugPrintf("CommerceInterface::addDetailedProductInfo() error. ret = 0x%x\n", ret);
|
||||
}
|
||||
|
||||
if (g_detailedProductInfo.hasResult())
|
||||
{
|
||||
// result has returned immediately (don't think this should happen, but was handled in the samples
|
||||
copyAddDetailedProductInfo(pInfo, g_detailedProductInfo.get());
|
||||
m_event = e_event_commerceAddedDetailedProductInfo;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -656,7 +611,7 @@ void SonyCommerce_Orbis::commerce2Handler( const sce::Toolkit::NP::Event& event)
|
||||
}
|
||||
case sce::Toolkit::NP::Event::UserEvent::commerceGotCategoryInfo:
|
||||
{
|
||||
copyCategoryInfo(m_pCategoryInfo, g_categoryInfo.get());
|
||||
app.DebugPrintf("commerceGotCategoryInfo STUB\n");
|
||||
m_pCategoryInfo = NULL;
|
||||
m_event = e_event_commerceGotCategoryInfo;
|
||||
break;
|
||||
@@ -664,7 +619,7 @@ void SonyCommerce_Orbis::commerce2Handler( const sce::Toolkit::NP::Event& event)
|
||||
|
||||
case sce::Toolkit::NP::Event::UserEvent::commerceGotProductList:
|
||||
{
|
||||
copyProductList(m_pProductInfoList, g_productList.get());
|
||||
app.DebugPrintf("commerceGotProductList STUB\n");
|
||||
m_pProductInfoDetailed = NULL;
|
||||
m_event = e_event_commerceGotProductList;
|
||||
break;
|
||||
@@ -672,16 +627,9 @@ void SonyCommerce_Orbis::commerce2Handler( const sce::Toolkit::NP::Event& event)
|
||||
|
||||
case sce::Toolkit::NP::Event::UserEvent::commerceGotDetailedProductInfo:
|
||||
{
|
||||
if(m_pProductInfoDetailed)
|
||||
{
|
||||
copyDetailedProductInfo(m_pProductInfoDetailed, g_detailedProductInfo.get());
|
||||
m_pProductInfoDetailed = NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
copyAddDetailedProductInfo(m_pProductInfo, g_detailedProductInfo.get());
|
||||
m_pProductInfo = NULL;
|
||||
}
|
||||
app.DebugPrintf("commerceGotDetailedProductInfo STUB\n");
|
||||
m_pProductInfoDetailed = NULL;
|
||||
m_pProductInfo = NULL;
|
||||
m_event = e_event_commerceGotDetailedProductInfo;
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user