diff options
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 } |