ilmControl: Remove ilm_Set/GetOptimizationMode and ilm_Set/GetChromaKey

Removed because they weren't implemented, and have little relevance
to weston.

Signed-off-by: James Thomas <james.thomas@codethink.co.uk>

4 files changed, 0 insertions, 149 deletions

diff --git a/ivi-layermanagement-examples/LayerManagerControl/include/LMControl.h b/ivi-layermanagement-examples/LayerManagerControl/include/LMControl.h
index 3ede657..6ac2254 100644
--- a/ivi-layermanagement-examples/LayerManagerControl/include/LMControl.h
+++ b/ivi-layermanagement-examples/LayerManagerControl/include/LMControl.h
@@ -257,8 +257,6 @@ void setSurfaceAcceptsInput(t_ilm_surface surfaceId, string kbdPointerTouch, t_i
 void testNotificationLayer(t_ilm_layer layerid);
 void watchLayer(unsigned int* layerids, unsigned int layeridCount);
 void watchSurface(unsigned int* surfaceids, unsigned int surfaceidCount);
-void setOptimization(t_ilm_uint id, t_ilm_uint mode);
-void getOptimization(t_ilm_uint id);
 
 
 //=============================================================================
diff --git a/ivi-layermanagement-examples/LayerManagerControl/src/commands.cpp b/ivi-layermanagement-examples/LayerManagerControl/src/commands.cpp
index f926400..61a6de8 100644
--- a/ivi-layermanagement-examples/LayerManagerControl/src/commands.cpp
+++ b/ivi-layermanagement-examples/LayerManagerControl/src/commands.cpp
@@ -679,61 +679,6 @@ COMMAND("set surface <surfaceid> accept <acceptance> input events from devices <
 }
 
 //=============================================================================
-COMMAND("set layer|surface <id> chromakey <red> <green> <blue>")
-//=============================================================================
-{
-    t_ilm_layer id = input->getUint("id");
-    t_ilm_int color[3] =
-    {
-        input->getInt("red"),
-        input->getInt("green"),
-        input->getInt("blue")
-    };
-
-    if (input->contains("layer"))
-    {
-        ilmErrorTypes callResult = ilm_layerSetChromaKey(id, color);
-        if (ILM_SUCCESS != callResult)
-        {
-            cout << "LayerManagerService returned: " << ILM_ERROR_STRING(callResult) << "\n";
-            cout << "Failed to set chroma key (" << color[0] << ", " << color[1] << ", " << color[2] << ") for layer with ID " << id << "\n";
-            return;
-        }
-
-        ilm_commitChanges();
-    }
-    else if (input->contains("surface"))
-    {
-        ilmErrorTypes callResult = ilm_surfaceSetChromaKey(id, color);
-        if (ILM_SUCCESS != callResult)
-        {
-            cout << "LayerManagerService returned: " << ILM_ERROR_STRING(callResult) << "\n";
-            cout << "Failed to set chroma key (" << color[0] << ", " << color[1] << ", " << color[2] << ") for surface with ID " << id << "\n";
-            return;
-        }
-
-        ilm_commitChanges();
-    }
-}
-
-//=============================================================================
-COMMAND("set surface <surfaceid> chromakey disabled")
-//=============================================================================
-{
-    t_ilm_surface surface = input->getUint("surfaceid");
-
-    ilmErrorTypes callResult = ilm_surfaceSetChromaKey(surface, NULL);
-    if (ILM_SUCCESS != callResult)
-    {
-        cout << "LayerManagerService returned: " << ILM_ERROR_STRING(callResult) << "\n";
-        cout << "Failed to disable chroma key for surface with ID " << surface << "\n";
-        return;
-    }
-
-    ilm_commitChanges();
-}
-
-//=============================================================================
 COMMAND("test notification layer <layerid>")
 //=============================================================================
 {
@@ -765,23 +710,6 @@ COMMAND("watch layer|surface <idarray>")
 }
 
 //=============================================================================
-COMMAND("set optimization <id> mode <mode>")
-//=============================================================================
-{
-    t_ilm_uint id = input->getUint("id");
-    t_ilm_uint mode = input->getUint("mode");
-    setOptimization(id, mode);
-}
-
-//=============================================================================
-COMMAND("get optimization <id>")
-//=============================================================================
-{
-    t_ilm_uint id = input->getUint("id");
-    getOptimization(id);
-}
-
-//=============================================================================
 COMMAND("analyze surface <surfaceid>")
 //=============================================================================
 {
diff --git a/ivi-layermanagement-examples/LayerManagerControl/src/control.cpp b/ivi-layermanagement-examples/LayerManagerControl/src/control.cpp
index 7404b2a..b7efbc1 100644
--- a/ivi-layermanagement-examples/LayerManagerControl/src/control.cpp
+++ b/ivi-layermanagement-examples/LayerManagerControl/src/control.cpp
@@ -348,70 +348,3 @@ void watchSurface(unsigned int* surfaceids, unsigned int surfaceidCount)
         delete[] surfaceids;
     }
 }
-
-void setOptimization(t_ilm_uint id, t_ilm_uint mode)
-{
-    ilmErrorTypes callResult = ilm_SetOptimizationMode((ilmOptimization)id,
-                                    (ilmOptimizationMode)mode);
-    if (ILM_SUCCESS != callResult)
-    {
-        cout << "LayerManagerService returned: " << ILM_ERROR_STRING(callResult) << "\n";
-        cout << "Failed to set optimization with ID " << id << " mode " << mode << "\n";
-        return;
-    }
-
-    ilm_commitChanges();
-}
-
-void getOptimization(t_ilm_uint id)
-{
-    ilmOptimization optimizationId = (ilmOptimization)id;
-    ilmOptimizationMode optimizationMode;
-
-    ilmErrorTypes callResult = ilm_GetOptimizationMode(optimizationId, &optimizationMode);
-    if (callResult == ILM_SUCCESS)
-    {
-        switch (optimizationId)
-        {
-        case ILM_OPT_MULTITEXTURE :
-            cout << "Optimization " << (int)optimizationId << " (Multitexture Optimization)" << endl;
-            break;
-
-        case ILM_OPT_SKIP_CLEAR :
-            cout << "Optimization " << (int)optimizationId << " (Skip Clear)" << endl;
-            break;
-        default:
-            cout << "Optimization " << "unknown" << endl;
-            break;
-        }
-
-        switch (optimizationMode)
-        {
-        case ILM_OPT_MODE_FORCE_OFF :
-            cout << "Mode " << (int)optimizationMode << " (forced off)" << endl;
-            break;
-
-        case ILM_OPT_MODE_FORCE_ON :
-            cout << "Mode " << (int)optimizationMode << " (forced on)" << endl;
-            break;
-        case ILM_OPT_MODE_HEURISTIC :
-            cout << "Mode " << (int)optimizationMode << " (Heuristic / Render choose the optimization)" << endl;
-            break;
-        case ILM_OPT_MODE_TOGGLE :
-            cout << "Mode " << (int)optimizationMode << " (Toggle on/and off rapidly for debugging)" << endl;
-            break;
-
-        default:
-            cout << "Mode " << "unknown" << endl;
-            break;
-        }
-    }
-    else
-    {
-        cout << "LayerManagerService returned: " << ILM_ERROR_STRING(callResult) << "\n";
-        cout << "Failed to get mode for optimization with ID " << optimizationId << "\n";
-        return;
-    }
-
-    ilm_commitChanges();
-}
diff --git a/ivi-layermanagement-examples/LayerManagerControl/src/print.cpp b/ivi-layermanagement-examples/LayerManagerControl/src/print.cpp
index a4d079b..c3e617e 100644
--- a/ivi-layermanagement-examples/LayerManagerControl/src/print.cpp
+++ b/ivi-layermanagement-examples/LayerManagerControl/src/print.cpp
@@ -177,10 +177,6 @@ void printLayerProperties(unsigned int layerid, const char* prefix)
         break;
     }
 
-    cout << prefix << "- chromakey:            "
-            << (p.chromaKeyEnabled ? "enabled " : "disabled ")
-            << "(r=" << p.chromaKeyRed << ", g=" << p.chromaKeyGreen << ", b=" << p.chromaKeyBlue << ")\n";
-
     cout << prefix << "- surface render order: ";
 
     int surfaceCount = 0;
@@ -340,10 +336,6 @@ void printSurfaceProperties(unsigned int surfaceid, const char* prefix)
             << (keyboardFocusSurfaceId == surfaceid ? "true" : "false")
             << "\n";
 
-    cout << prefix << "- chromakey:          "
-            << (p.chromaKeyEnabled ? "enabled " : "disabled ")
-            << "(r=" << p.chromaKeyRed << ", g=" << p.chromaKeyGreen << ", b=" << p.chromaKeyBlue << ")\n";
-
     cout << prefix << "- counters:           frame=" << p.frameCounter
             << ", draw=" << p.drawCounter << ", update=" << p.updateCounter
             << "\n";