Rename files to match the names of the libraries

Rename media.* to mediactl.* and subdev.* v4l2subdev.*.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 52628d2..2583464 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 lib_LTLIBRARIES = libmediactl.la libv4l2subdev.la
-libmediactl_la_SOURCES = media.c
-libv4l2subdev_la_SOURCES = subdev.c
+libmediactl_la_SOURCES = mediactl.c
+libv4l2subdev_la_SOURCES = v4l2subdev.c
 mediactl_includedir=$(includedir)/mediactl
-mediactl_include_HEADERS = media.h subdev.h
+mediactl_include_HEADERS = mediactl.h v4l2subdev.h
 
 bin_PROGRAMS = media-ctl
 media_ctl_CFLAGS = $(LIBUDEV_CFLAGS)

diff --git a/src/main.c b/src/main.c
index b9b9150..55a6e2d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -36,9 +36,9 @@
 #include <linux/v4l2-subdev.h>
 #include <linux/videodev2.h>
 
-#include "media.h"
+#include "mediactl.h"
 #include "options.h"
-#include "subdev.h"
+#include "v4l2subdev.h"
 #include "tools.h"
 
 /* -----------------------------------------------------------------------------

diff --git a/src/media.c b/src/mediactl.c
similarity index 99%
rename from src/media.c
rename to src/mediactl.c
index f443d0c..8f7d0a9 100644 (file)
--- a/src/media.c
+++ b/src/mediactl.c
@@ -33,7 +33,7 @@
 #include <linux/videodev2.h>
 #include <linux/media.h>
 
-#include "media.h"
+#include "mediactl.h"
 #include "tools.h"
 
 struct media_pad *media_entity_remote_source(struct media_pad *pad)
@@ -472,4 +472,3 @@ void media_close(struct media_device *media)
        free(media->entities);
        free(media);
 }
-

diff --git a/src/media.h b/src/mediactl.h
similarity index 99%
rename from src/media.h
rename to src/mediactl.h
index b91a2ac..b53b9cc 100644 (file)
--- a/src/media.h
+++ b/src/mediactl.h
@@ -158,4 +158,3 @@ int media_setup_link(struct media_device *media,
 int media_reset_links(struct media_device *media);
 
 #endif
-

diff --git a/src/subdev.c b/src/v4l2subdev.c
similarity index 98%
rename from src/subdev.c
rename to src/v4l2subdev.c
index f8ccfe3..785209b 100644 (file)
--- a/src/subdev.c
+++ b/src/v4l2subdev.c
@@ -29,8 +29,8 @@
 
 #include <linux/v4l2-subdev.h>
 
-#include "media.h"
-#include "subdev.h"
+#include "mediactl.h"
+#include "v4l2subdev.h"
 #include "tools.h"
 
 int v4l2_subdev_open(struct media_entity *entity)

diff --git a/src/subdev.h b/src/v4l2subdev.h
similarity index 99%
rename from src/subdev.h
rename to src/v4l2subdev.h
index b5772e0..37cae08 100644 (file)
--- a/src/subdev.h
+++ b/src/v4l2subdev.h
@@ -159,4 +159,3 @@ int v4l2_subdev_set_frame_interval(struct media_entity *entity,
        struct v4l2_fract *interval);
 
 #endif
-