From dc0bc30cd78853d39e33e7e3fe69798794325ff4 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Thu, 2 Feb 2012 07:45:32 +0100 Subject: [PATCH] libspark: rename files to common names Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/00fe1f2ed4e0747abba44b611e4cad1e59567e58 Author: Stefan Seyfried Date: 2012-02-02 (Thu, 02 Feb 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libspark/Makefile.am | 16 ++++++++-------- libspark/{audio_td.cpp => audio.cpp} | 2 +- libspark/{audio_td.h => audio_lib.h} | 0 libspark/cs_api.h | 2 +- libspark/{dmx_td.cpp => dmx.cpp} | 4 ++-- libspark/dmx_cs.h | 2 +- libspark/{dmx_td.h => dmx_lib.h} | 0 libspark/{init_td.cpp => init.cpp} | 2 +- libspark/init_cs.h | 4 ++-- libspark/{init_td.h => init_lib.h} | 0 libspark/lt_dfbinput.cpp | 2 +- libspark/{playback_td.cpp => playback.cpp} | 8 ++++---- libspark/playback.h | 1 - libspark/{playback_td.h => playback_lib.h} | 0 libspark/{record_td.cpp => record.cpp} | 2 +- libspark/{record_td.h => record_lib.h} | 2 +- libspark/{video_td.cpp => video.cpp} | 2 +- libspark/{video_td.h => video_lib.h} | 0 18 files changed, 24 insertions(+), 25 deletions(-) rename libspark/{audio_td.cpp => audio.cpp} (99%) rename libspark/{audio_td.h => audio_lib.h} (100%) rename libspark/{dmx_td.cpp => dmx.cpp} (99%) rename libspark/{dmx_td.h => dmx_lib.h} (100%) rename libspark/{init_td.cpp => init.cpp} (99%) rename libspark/{init_td.h => init_lib.h} (100%) rename libspark/{playback_td.cpp => playback.cpp} (99%) delete mode 100644 libspark/playback.h rename libspark/{playback_td.h => playback_lib.h} (100%) rename libspark/{record_td.cpp => record.cpp} (99%) rename libspark/{record_td.h => record_lib.h} (97%) rename libspark/{video_td.cpp => video.cpp} (99%) rename libspark/{video_td.h => video_lib.h} (100%) diff --git a/libspark/Makefile.am b/libspark/Makefile.am index ba38724..acd892f 100644 --- a/libspark/Makefile.am +++ b/libspark/Makefile.am @@ -1,18 +1,18 @@ INCLUDES = \ @DIRECTFB_CFLAGS@ -noinst_LIBRARIES = libtriple.a +noinst_LIBRARIES = libspark.a AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing -libtriple_a_SOURCES = \ +libspark_a_SOURCES = \ lt_dfbinput.cpp \ lt_debug.cpp \ - dmx_td.cpp \ + dmx.cpp \ ca.cpp \ - video_td.cpp \ - audio_td.cpp \ - init_td.cpp \ - playback_td.cpp \ + video.cpp \ + audio.cpp \ + init.cpp \ + playback.cpp \ pwrmngr.cpp \ - record_td.cpp + record.cpp diff --git a/libspark/audio_td.cpp b/libspark/audio.cpp similarity index 99% rename from libspark/audio_td.cpp rename to libspark/audio.cpp index eb21456..704a393 100644 --- a/libspark/audio_td.cpp +++ b/libspark/audio.cpp @@ -8,7 +8,7 @@ #include #include #define AUDIO_DEVICE "/dev/" DEVICE_NAME_AUDIO -#include "audio_td.h" +#include "audio_lib.h" #include "lt_debug.h" #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_AUDIO, this, args) #define lt_info(args...) _lt_info(TRIPLE_DEBUG_AUDIO, this, args) diff --git a/libspark/audio_td.h b/libspark/audio_lib.h similarity index 100% rename from libspark/audio_td.h rename to libspark/audio_lib.h diff --git a/libspark/cs_api.h b/libspark/cs_api.h index 292430d..fb5d613 100644 --- a/libspark/cs_api.h +++ b/libspark/cs_api.h @@ -4,7 +4,7 @@ #ifndef __CS_API_H_ #define __CS_API_H_ -#include "init_td.h" +#include "init_lib.h" typedef void (*cs_messenger) (unsigned int msg, unsigned int data); #if 0 diff --git a/libspark/dmx_td.cpp b/libspark/dmx.cpp similarity index 99% rename from libspark/dmx_td.cpp rename to libspark/dmx.cpp index 8f9247b..8a24ce1 100644 --- a/libspark/dmx_td.cpp +++ b/libspark/dmx.cpp @@ -9,11 +9,11 @@ #include #include #include -#include "dmx_td.h" +#include "dmx_lib.h" #include "lt_debug.h" /* Ugh... see comment in destructor for details... */ -#include "video_td.h" +#include "video_lib.h" extern cVideo *videoDecoder; #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_DEMUX, this, args) diff --git a/libspark/dmx_cs.h b/libspark/dmx_cs.h index 4f0dbc1..175d8cb 100644 --- a/libspark/dmx_cs.h +++ b/libspark/dmx_cs.h @@ -1 +1 @@ -#include "dmx_td.h" +#include "dmx_lib.h" diff --git a/libspark/dmx_td.h b/libspark/dmx_lib.h similarity index 100% rename from libspark/dmx_td.h rename to libspark/dmx_lib.h diff --git a/libspark/init_td.cpp b/libspark/init.cpp similarity index 99% rename from libspark/init_td.cpp rename to libspark/init.cpp index 121297d..b49bdc7 100644 --- a/libspark/init_td.cpp +++ b/libspark/init.cpp @@ -1,6 +1,6 @@ #include -#include "init_td.h" +#include "init_lib.h" #include #include #include diff --git a/libspark/init_cs.h b/libspark/init_cs.h index 5894a14..7f9e341 100644 --- a/libspark/init_cs.h +++ b/libspark/init_cs.h @@ -1,2 +1,2 @@ -#warning using init_cs.h from libtriple -#include "init_td.h" +#warning using init_cs.h from libspark +#include "init_lib.h" diff --git a/libspark/init_td.h b/libspark/init_lib.h similarity index 100% rename from libspark/init_td.h rename to libspark/init_lib.h diff --git a/libspark/lt_dfbinput.cpp b/libspark/lt_dfbinput.cpp index 252d14f..720d7e2 100644 --- a/libspark/lt_dfbinput.cpp +++ b/libspark/lt_dfbinput.cpp @@ -40,7 +40,7 @@ #include "lt_dfbinput.h" /* needed for videodecoder watchdog */ -#include "video_td.h" +#include "video_lib.h" extern cVideo *videoDecoder; /* same defines as in neutrino's rcinput.h */ diff --git a/libspark/playback_td.cpp b/libspark/playback.cpp similarity index 99% rename from libspark/playback_td.cpp rename to libspark/playback.cpp index 0455a79..3484314 100644 --- a/libspark/playback_td.cpp +++ b/libspark/playback.cpp @@ -6,10 +6,10 @@ #include #include -#include "playback_td.h" -#include "dmx_td.h" -#include "audio_td.h" -#include "video_td.h" +#include "playback_lib.h" +#include "dmx_lib.h" +#include "audio_lib.h" +#include "video_lib.h" #include "lt_debug.h" #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_PLAYBACK, this, args) #define lt_info(args...) _lt_info(TRIPLE_DEBUG_PLAYBACK, this, args) diff --git a/libspark/playback.h b/libspark/playback.h deleted file mode 100644 index 6e6b4c5..0000000 --- a/libspark/playback.h +++ /dev/null @@ -1 +0,0 @@ -#include "playback_td.h" diff --git a/libspark/playback_td.h b/libspark/playback_lib.h similarity index 100% rename from libspark/playback_td.h rename to libspark/playback_lib.h diff --git a/libspark/record_td.cpp b/libspark/record.cpp similarity index 99% rename from libspark/record_td.cpp rename to libspark/record.cpp index 32c1a01..5e089b8 100644 --- a/libspark/record_td.cpp +++ b/libspark/record.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "record_td.h" +#include "record_lib.h" #include "lt_debug.h" #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_RECORD, this, args) #define lt_info(args...) _lt_info(TRIPLE_DEBUG_RECORD, this, args) diff --git a/libspark/record_td.h b/libspark/record_lib.h similarity index 97% rename from libspark/record_td.h rename to libspark/record_lib.h index 75099f7..8b882d6 100644 --- a/libspark/record_td.h +++ b/libspark/record_lib.h @@ -2,7 +2,7 @@ #define __RECORD_TD_H #include -#include "dmx_td.h" +#include "dmx_lib.h" typedef enum { RECORD_RUNNING, diff --git a/libspark/video_td.cpp b/libspark/video.cpp similarity index 99% rename from libspark/video_td.cpp rename to libspark/video.cpp index 2ad99d5..54a76a0 100644 --- a/libspark/video_td.cpp +++ b/libspark/video.cpp @@ -31,7 +31,7 @@ #include #include -#include "video_td.h" +#include "video_lib.h" #include #define VIDEO_DEVICE "/dev/" DEVICE_NAME_VIDEO #include "lt_debug.h" diff --git a/libspark/video_td.h b/libspark/video_lib.h similarity index 100% rename from libspark/video_td.h rename to libspark/video_lib.h