diff options
author | gregory guy <gregory-tde@laposte.net> | 2020-03-29 19:41:28 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2021-01-26 15:37:01 +0100 |
commit | f11f6d6ded39175d915422da2bac6fb6ffc924f9 (patch) | |
tree | 8a281ef5def0c82ebf101a1229ed52d85f623852 /kttsd/players/alsaplayer | |
parent | 7eca1e554ec80ab1d36bb93834fc8b0a161be3b1 (diff) | |
download | tdeaccessibility-f11f6d6ded39175d915422da2bac6fb6ffc924f9.tar.gz tdeaccessibility-f11f6d6ded39175d915422da2bac6fb6ffc924f9.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>
(cherry picked from commit 6b3181cf92f1fc74da1e8a82f690a1526cb4e900)
Diffstat (limited to 'kttsd/players/alsaplayer')
-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 |
3 files changed, 48 insertions, 11 deletions
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> |