1 files changed, 10 insertions, 11 deletions

diff --git a/src/app.cpp b/src/app.cpp
index 1c9b3c2..f925e3d 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -86,17 +86,17 @@ struct result<layouts_type> load_layout(char const *filename) {
    return Ok(layouts);
 }
 
-struct result<surface_id_to_layer_map>
+struct result<layer_map>
    load_layer_ids(char const *filename) {
    DB("loading IDs from " << filename);
 
    auto j = file_to_json(filename);
    if (j.is_err()) {
-      return Err<surface_id_to_layer_map>(j.unwrap_err());
+      return Err<layer_map>(j.unwrap_err());
    }
    json jids = j.unwrap();
 
-   return to_surface_id_to_layer_map(jids);
+   return to_layer_map(jids);
 }
 
 }  // namespace
@@ -114,14 +114,14 @@ App::App(wl::display *d)
      controller{},
      outputs(),
      layouts(),
-     surface2layer() {
+     layers() {
    assert(g_app == nullptr);
    g_app = this;
 
    {
       auto l = load_layer_ids("../ids.json");
       if (l.is_ok()) {
-         this->surface2layer = l.unwrap();
+         this->layers = l.unwrap();
       } else {
          logerror("%s", l.err().value());
       }
@@ -144,7 +144,7 @@ int App::init() {
       return -1;
    }
 
-   if (this->surface2layer.mapping.empty()) {
+   if (this->layers.mapping.empty()) {
       logerror("No surface -> layer mapping loaded");
       return -1;
    }
@@ -230,7 +230,7 @@ int App::init_layout() {
    // Quick and dirty setup of layers
    // XXX: This likely needs to be sorted by order (note, we don't (yet?)
    // do any zorder arrangement).
-   for (auto const &i : this->surface2layer.mapping) {
+   for (auto const &i : this->layers.mapping) {
       c->layer_create(i.layer_id, o->width, o->height);
       auto &l = layers[i.layer_id];
       l->set_destination_rectangle(0, 0, o->width, o->height);
@@ -240,7 +240,7 @@ int App::init_layout() {
    }
 
    // Add layers to screen (XXX: are they sorted correctly?)
-   s->set_render_order(this->surface2layer.layers);
+   s->set_render_order(this->layers.layers);
 
    c->commit_changes();
 
@@ -257,13 +257,12 @@ int App::init_layout() {
 // |_|
 void App::surface_created(uint32_t surface_id) {
    DB("surface_id is " << surface_id);
-   int layer_id =
-      this->surface2layer.get_layer_for_surface(surface_id).value_or(-1);
+   int layer_id = this->layers.get_layer_id(surface_id).value_or(-1);
    if (layer_id == -1) {
       logerror("Surface %d (0x%x) is not part of any layer!", surface_id,
                surface_id);
    } else {
-      auto rect = this->surface2layer.get_rect_for_surface(surface_id).value();
+      auto rect = this->layers.get_layer_rect(surface_id).value();
       this->controller->add_task(
          "fullscreen surface",
          [layer_id, surface_id, rect](struct genivi::controller *c) {