diff options
author | gregory guy <gregory-tde@laposte.net> | 2020-03-29 19:41:28 +0200 |
---|---|---|
committer | gregory guy <gregory-tde@laposte.net> | 2021-01-26 11:52:09 +0100 |
commit | 6b3181cf92f1fc74da1e8a82f690a1526cb4e900 (patch) | |
tree | b2bcaa0683427ddc2a1d692870d731c238f6cce8 /kttsd/players | |
parent | e09ebe446c909827c78f7c6d76b94ce4adea139d (diff) | |
download | tdeaccessibility-6b3181cf92f1fc74da1e8a82f690a1526cb4e900.tar.gz tdeaccessibility-6b3181cf92f1fc74da1e8a82f690a1526cb4e900.zip |
Conversion to the cmake building system.
Added several man pages taken from the Debian packaging.
Cleanup headers in ui files.
Add png icons for mono theme.
Signed-off-by: gregory guy <gregory-tde@laposte.net>
cmake:
- Use tde_add_check_executable instead of a combination
of separate calls to tde_add_executable and add_test.
- Simplify the detection of time.h and sys/time.h headers.
- Refactor phrasebook files install, kmouth.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kttsd/players')
-rw-r--r-- | kttsd/players/CMakeLists.txt | 12 | ||||
-rw-r--r-- | kttsd/players/akodeplayer/CMakeLists.txt | 37 | ||||
-rw-r--r-- | kttsd/players/akodeplayer/akodeplayer.cpp | 4 | ||||
-rw-r--r-- | kttsd/players/akodeplayer/akodeplayer.h | 5 | ||||
-rw-r--r-- | kttsd/players/alsaplayer/CMakeLists.txt | 38 | ||||
-rw-r--r-- | kttsd/players/alsaplayer/alsaplayer.cpp | 16 | ||||
-rw-r--r-- | kttsd/players/alsaplayer/alsaplayer.h | 5 | ||||
-rw-r--r-- | kttsd/players/artsplayer/CMakeLists.txt | 38 | ||||
-rw-r--r-- | kttsd/players/artsplayer/artsplayer.h | 5 | ||||
-rw-r--r-- | kttsd/players/gstplayer/CMakeLists.txt | 39 | ||||
-rw-r--r-- | kttsd/players/gstplayer/gstreamerplayer.h | 2 |
11 files changed, 187 insertions, 14 deletions
diff --git a/kttsd/players/CMakeLists.txt b/kttsd/players/CMakeLists.txt new file mode 100644 index 0000000..12cabb0 --- /dev/null +++ b/kttsd/players/CMakeLists.txt @@ -0,0 +1,12 @@ +tde_conditional_add_subdirectory( WITH_ARTS artsplayer ) +tde_conditional_add_subdirectory( WITH_AKODE akodeplayer ) +tde_conditional_add_subdirectory( WITH_ALSA alsaplayer ) +tde_conditional_add_subdirectory( WITH_GSTREAMER gstplayer ) + + +##### other data + +tde_create_translated_desktop( + SOURCE kttsd_audioplugin.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} +) diff --git a/kttsd/players/akodeplayer/CMakeLists.txt b/kttsd/players/akodeplayer/CMakeLists.txt new file mode 100644 index 0000000..f8a03f7 --- /dev/null +++ b/kttsd/players/akodeplayer/CMakeLists.txt @@ -0,0 +1,37 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kttsd/libkttsd +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### libkttsd_akodeplugin (kpart) + +tde_add_kpart( libkttsd_akodeplugin AUTOMOC + + SOURCES + akodeplugin.cpp + akodeplayer.cpp + LINK + kttsd-shared + ${AKODE_LIBRARIES} + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kttsd_akodeplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kttsd/players/akodeplayer/akodeplayer.cpp b/kttsd/players/akodeplayer/akodeplayer.cpp index 13f6cf3..955bf1b 100644 --- a/kttsd/players/akodeplayer/akodeplayer.cpp +++ b/kttsd/players/akodeplayer/akodeplayer.cpp @@ -12,7 +12,9 @@ * * ***************************************************************************/ -#include <config.h> +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include <kdebug.h> diff --git a/kttsd/players/akodeplayer/akodeplayer.h b/kttsd/players/akodeplayer/akodeplayer.h index c4c7c1c..d51d7fb 100644 --- a/kttsd/players/akodeplayer/akodeplayer.h +++ b/kttsd/players/akodeplayer/akodeplayer.h @@ -16,7 +16,10 @@ #ifndef AKODEPLAYER_H #define AKODEPLAYER_H -#include <config.h> +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "kdeexportfix.h" #include <tqstring.h> diff --git a/kttsd/players/alsaplayer/CMakeLists.txt b/kttsd/players/alsaplayer/CMakeLists.txt new file mode 100644 index 0000000..155024f --- /dev/null +++ b/kttsd/players/alsaplayer/CMakeLists.txt @@ -0,0 +1,38 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kttsd/libkttsd + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${ALSA_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### libkttsd_alsaplugin (kpart) + +tde_add_kpart( libkttsd_alsaplugin AUTOMOC + + SOURCES + alsaplugin.cpp + alsaplayer.cpp + LINK + kttsd-shared + ${ALSA_LIBRARIES} + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kttsd_alsaplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kttsd/players/alsaplayer/alsaplayer.cpp b/kttsd/players/alsaplayer/alsaplayer.cpp index a840c0b..c67564d 100644 --- a/kttsd/players/alsaplayer/alsaplayer.cpp +++ b/kttsd/players/alsaplayer/alsaplayer.cpp @@ -24,18 +24,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ +// AlsaPlayer includes. +#include "alsaplayer.h" + // #include <sys/wait.h> // System includes. -#include <config.h> -#if TIME_WITH_SYS_TIME +#if defined(HAVE_SYS_TIME_H) # include <sys/time.h> +#endif +#if defined(TIME_WITH_SYS_TIME) # include <time.h> -#else -# if HAVE_SYS_TIME_H -# include <sys/time.h> -# else -# include <time.h> -# endif #endif // TQt includes. @@ -50,8 +48,6 @@ #include <tdemessagebox.h> #include <tdelocale.h> -// AlsaPlayer includes. -#include "alsaplayer.h" #if !defined(__GNUC__) || __GNUC__ >= 3 #define ERR(...) do {\ diff --git a/kttsd/players/alsaplayer/alsaplayer.h b/kttsd/players/alsaplayer/alsaplayer.h index deeff4b..73d2570 100644 --- a/kttsd/players/alsaplayer/alsaplayer.h +++ b/kttsd/players/alsaplayer/alsaplayer.h @@ -24,6 +24,10 @@ #ifndef ALSAPLAYER_H #define ALSAPLAYER_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + // System includes. #include <alsa/asoundlib.h> #include <sys/poll.h> @@ -36,7 +40,6 @@ #include <tqmutex.h> // KDE includes. -#include <config.h> #include <kdemacros.h> #include "kdeexportfix.h" #include <kurl.h> diff --git a/kttsd/players/artsplayer/CMakeLists.txt b/kttsd/players/artsplayer/CMakeLists.txt new file mode 100644 index 0000000..427f970 --- /dev/null +++ b/kttsd/players/artsplayer/CMakeLists.txt @@ -0,0 +1,38 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kttsd/libkttsd + ${ARTS_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### libkttsd_artsplugin (kpart) + +tde_add_kpart( libkttsd_artsplugin AUTOMOC + + SOURCES + artsplugin.cpp + artsplayer.cpp + LINK + kttsd-shared + ${ARTS_PLAYER_LIBRARIES} + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kttsd_artsplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kttsd/players/artsplayer/artsplayer.h b/kttsd/players/artsplayer/artsplayer.h index 99f3edc..edae1fc 100644 --- a/kttsd/players/artsplayer/artsplayer.h +++ b/kttsd/players/artsplayer/artsplayer.h @@ -19,7 +19,10 @@ #ifndef ARTSPLAYER_H #define ARTSPLAYER_H -#include <config.h> +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <kdemacros.h> #include "kdeexportfix.h" diff --git a/kttsd/players/gstplayer/CMakeLists.txt b/kttsd/players/gstplayer/CMakeLists.txt new file mode 100644 index 0000000..1aa4e64 --- /dev/null +++ b/kttsd/players/gstplayer/CMakeLists.txt @@ -0,0 +1,39 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kttsd/libkttsd + ${GSTREAMER_INCLUDE_DIRS} + ${GLIB2_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### libkttsd_gstplugin (kpart) + +tde_add_kpart( libkttsd_gstplugin AUTOMOC + + SOURCES + gstplugin.cpp + gstreamerplayer.cpp + LINK + kttsd-shared + ${GSTREAMER_LIBRARIES} + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kttsd_gstplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kttsd/players/gstplayer/gstreamerplayer.h b/kttsd/players/gstplayer/gstreamerplayer.h index 27cd329..fd8baf7 100644 --- a/kttsd/players/gstplayer/gstreamerplayer.h +++ b/kttsd/players/gstplayer/gstreamerplayer.h @@ -15,7 +15,9 @@ #ifndef GSTREAMERPLAYER_H #define GSTREAMERPLAYER_H +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include <glib.h> extern "C" { |