diff options
| author | Slávek Banko <[email protected]> | 2020-04-07 18:46:03 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2020-04-10 12:47:04 +0200 |
| commit | d9a4368be5b46944bc00e9357a171d6c77f6da32 (patch) | |
| tree | b56cf10ba859ddefbc805dda92d5b34e08218645 /src/notecontent.cpp | |
| parent | 4cac2cf12cab8e55a411ea60dd18b80f20c284c9 (diff) | |
| download | basket-d9a4368be5b46944bc00e9357a171d6c77f6da32.tar.gz basket-d9a4368be5b46944bc00e9357a171d6c77f6da32.zip | |
Add a paired constant for WITHOUT_ARTS so that WITH_ARTS can be used
in the code without double negation.
Signed-off-by: Slávek Banko <[email protected]>
Signed-off-by: gregory guy <[email protected]>
(cherry picked from commit c6b4624a36c2efe115d42a6c799471cb0761ed66)
Diffstat (limited to 'src/notecontent.cpp')
| -rw-r--r-- | src/notecontent.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/notecontent.cpp b/src/notecontent.cpp index c22743e..d7da39d 100644 --- a/src/notecontent.cpp +++ b/src/notecontent.cpp @@ -67,12 +67,11 @@ #include "kcolorcombo2.h" #include "htmlexporter.h" -#include "config.h" -#ifndef WITHOUT_ARTS - #include <arts/kplayobject.h> - #include <arts/kplayobjectfactory.h> - #include <arts/kartsserver.h> - #include <arts/kartsdispatcher.h> +#ifdef WITH_ARTS +#include <arts/kplayobject.h> +#include <arts/kplayobjectfactory.h> +#include <arts/kartsserver.h> +#include <arts/kartsdispatcher.h> #endif /** class NoteContent: @@ -1164,11 +1163,7 @@ TQString SoundContent::zoneTip(int zone) void SoundContent::setHoveredZone(int oldZone, int newZone) { -#ifdef WITHOUT_ARTS - Q_UNUSED(oldZone); - if (newZone == Note::Custom0 || newZone == Note::Content) - std::cout << "Compiled without aRts: sound is not played." << std::endl; -#else +#ifdef WITH_ARTS static KArtsDispatcher *s_dispatcher = new KArtsDispatcher(); // Needed for s_playObj (we don't use it directly) static KArtsServer *s_playServer = new KArtsServer(); static KDE::PlayObjectFactory *s_playFactory = new KDE::PlayObjectFactory(s_playServer); @@ -1189,6 +1184,10 @@ void SoundContent::setHoveredZone(int oldZone, int newZone) s_playObj = 0; } } +#else + Q_UNUSED(oldZone); + if (newZone == Note::Custom0 || newZone == Note::Content) + std::cout << "Compiled without aRts: sound is not played." << std::endl; #endif } |