From ffae15e36ae769288141f7fb5e0285b7753224b4 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rvimont@genymobile.com>
Date: Thu, 8 Feb 2018 11:26:31 +0100
Subject: [PATCH] Rename control to controller

The struct decoder is defined in decoder.h.

For naming consistency, define the struct controller in controller.h.
---
 app/meson.build                     | 2 +-
 app/src/{control.c => controller.c} | 2 +-
 app/src/{control.h => controller.h} | 0
 app/src/scrcpy.c                    | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename app/src/{control.c => controller.c} (99%)
 rename app/src/{control.h => controller.h} (100%)

diff --git a/app/meson.build b/app/meson.build
index b1606720..b035de80 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -3,8 +3,8 @@ project('scrcpy-app', 'c')
 src = [
     'src/main.c',
     'src/command.c',
-    'src/control.c',
     'src/controlevent.c',
+    'src/controller.c',
     'src/convert.c',
     'src/decoder.c',
     'src/frames.c',
diff --git a/app/src/control.c b/app/src/controller.c
similarity index 99%
rename from app/src/control.c
rename to app/src/controller.c
index ece452da..396b27af 100644
--- a/app/src/control.c
+++ b/app/src/controller.c
@@ -1,4 +1,4 @@
-#include "control.h"
+#include "controller.h"
 
 #include "lockutil.h"
 
diff --git a/app/src/control.h b/app/src/controller.h
similarity index 100%
rename from app/src/control.h
rename to app/src/controller.h
diff --git a/app/src/scrcpy.c b/app/src/scrcpy.c
index 1d51c4af..3a708f36 100644
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -10,7 +10,7 @@
 
 #include "command.h"
 #include "common.h"
-#include "control.h"
+#include "controller.h"
 #include "convert.h"
 #include "decoder.h"
 #include "events.h"