Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (16 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/3rdparty/phonon/gstreamer/CMakeLists.txt

    r2 r561  
    1818
    1919if (BUILD_PHONON_GSTREAMER)
    20    include_directories(${GSTREAMER_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR}
    21       ${LIBXML2_INCLUDE_DIR})
     20   include_directories(
     21          ${CMAKE_CURRENT_BINARY_DIR}
     22          ${GSTREAMER_INCLUDE_DIR}
     23          ${GLIB2_INCLUDE_DIR}
     24      ${LIBXML2_INCLUDE_DIR}
     25          ${X11_X11_INCLUDE_PATH})
     26   add_definitions(-DPHONON_BACKEND_VERSION_4_2)
     27
     28   # configure plugin api
     29   if(USE_INSTALL_PLUGIN)
     30      set(PLUGIN_INSTALL_API TRUE)
     31   endif(USE_INSTALL_PLUGIN)
     32
     33   configure_file(phonon-config-gstreamer.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/phonon-config-gstreamer.h )
    2234
    2335   set(phonon_gstreamer_SRCS
    … …  
    4658
    4759   find_package(Alsa)
    48    if(ALSA_FOUND)
     60   macro_ensure_version("0.10.22" ${GSTREAMER_VERSION} GSTREAMER_HAS_NONBLOCKING_ALSASINK)
     61   if(ALSA_FOUND AND NOT GSTREAMER_HAS_NONBLOCKING_ALSASINK)
    4962      add_definitions(-DUSE_ALSASINK2)
    5063      include_directories(${ALSA_INCLUDES})
    … …  
    5366         alsasink2.c
    5467         )
    55    endif(ALSA_FOUND)
     68   endif(ALSA_FOUND AND NOT GSTREAMER_HAS_NONBLOCKING_ALSASINK)
    5669
    57    automoc4(phonon_gstreamer phonon_gstreamer_SRCS)
    58    add_library(phonon_gstreamer SHARED ${phonon_gstreamer_SRCS})
     70   automoc4_add_library(phonon_gstreamer MODULE ${phonon_gstreamer_SRCS})
    5971   set_target_properties(phonon_gstreamer PROPERTIES PREFIX "")
    6072   target_link_libraries(phonon_gstreamer

  • trunk/src/3rdparty/phonon/gstreamer/abstractrenderer.cpp

    r2 r561  
    1818#include "abstractrenderer.h"
    1919
     20#ifndef QT_NO_PHONON_VIDEO
    2021QT_BEGIN_NAMESPACE
    2122
    … …  
    5354
    5455QT_END_NAMESPACE
     56#endif //QT_NO_PHONON_VIDEO
    5557
    56 

  • trunk/src/3rdparty/phonon/gstreamer/abstractrenderer.h

    r2 r561  
    2424#include <phonon/videowidget.h>
    2525
     26#ifndef QT_NO_PHONON_VIDEO
    2627QT_BEGIN_NAMESPACE
    2728
    … …  
    5960
    6061QT_END_NAMESPACE
    61 
     62#endif //QT_NO_PHONON_VIDEO
    6263#endif // Phonon_GSTREAMER_ABSTRACTRENDERER_H

  • trunk/src/3rdparty/phonon/gstreamer/artssink.cpp

    r2 r561  
    234234    GST_DEBUG_OBJECT (src, "initializing artssink");
    235235    src->stream = 0;
    236 
     236#ifndef QT_NO_LIBRARY
    237237    p_arts_init =  (Ptr_arts_init)QLibrary::resolve(QLatin1String("artsc"), 0, "arts_init");
    238238    p_arts_play_stream =  (Ptr_arts_play_stream)QLibrary::resolve(QLatin1String("artsc"), 0, "arts_play_stream");
    … …  
    251251    }
    252252    sinkCount ++;
     253#endif //QT_NO_LIBRARY
    253254}
    254255

  • trunk/src/3rdparty/phonon/gstreamer/audioeffect.cpp

    r2 r561  
    2424
    2525#include <gst/gst.h>
    26 
     26#ifndef QT_NO_PHONON_EFFECT
    2727QT_BEGIN_NAMESPACE
    2828
    … …  
    7676
    7777QT_END_NAMESPACE
     78#endif //QT_NO_PHONON_EFFECT
    7879#include "moc_audioeffect.cpp"

  • trunk/src/3rdparty/phonon/gstreamer/audioeffect.h

    r2 r561  
    3030#include <gst/gst.h>
    3131
     32#ifndef QT_NO_PHONON_EFFECT
    3233QT_BEGIN_NAMESPACE
    33 
    3434namespace Phonon
    3535{
    … …  
    5050    };
    5151}} //namespace Phonon::Gstreamer
    52 
    5352QT_END_NAMESPACE
     53#endif //QT_NO_PHONON_EFFECT
    5454
    5555#endif // Phonon_GSTREAMER_AUDIOEFFECT_H

  • trunk/src/3rdparty/phonon/gstreamer/audiooutput.cpp

    r2 r561  
    4343    m_name = "AudioOutput" + QString::number(count++);
    4444    if (m_backend->isValid()) {
    45         g_set_application_name(qApp->applicationName().toUtf8());
    4645        m_audioBin = gst_bin_new (NULL);
    4746        gst_object_ref (GST_OBJECT (m_audioBin));
    … …  
    138137    bool success = false;
    139138    const QList<AudioDevice> deviceList = m_backend->deviceManager()->audioOutputDevices();
    140     if (m_audioSink &&  newDevice >= 0 && newDevice < deviceList.size()) {
     139    int deviceIdx = -1;
     140    for (int i=0; i<deviceList.size(); i++) {
     141        if (deviceList.at(i).id == newDevice) {
     142            deviceIdx = i;
     143            break;
     144        }
     145    }
     146
     147    if (m_audioSink && deviceIdx >= 0) {
    141148        // Save previous state
    142149        GstState oldState = GST_STATE(m_audioSink);
    143150        const QByteArray oldDeviceValue = GstHelper::property(m_audioSink, "device");
    144         const QByteArray deviceId = deviceList.at(newDevice).gstId;
     151        const QByteArray deviceId = deviceList.at(deviceIdx).gstId;
    145152        m_device = newDevice;
    146153

  • trunk/src/3rdparty/phonon/gstreamer/backend.cpp

    r2 r561  
    5050        , m_isValid(false)
    5151{
     52    // In order to support reloading, we only set the app name once...
     53    static bool first = true;
     54    if (first) {
     55        first = false;
     56        g_set_application_name(qApp->applicationName().toUtf8());
     57    }
     58
    5259    GError *err = 0;
    5360    bool wasInit = gst_init_check(0, 0, &err);  //init gstreamer: must be called before any gst-related functions
    … …  
    5663
    5764    qRegisterMetaType<Message>("Message");
    58 
     65#ifndef QT_NO_PROPERTIES
    5966    setProperty("identifier",     QLatin1String("phonon_gstreamer"));
    6067    setProperty("backendName",    QLatin1String("Gstreamer"));
    6168    setProperty("backendComment", QLatin1String("Gstreamer plugin for Phonon"));
    6269    setProperty("backendVersion", QLatin1String("0.2"));
    63     setProperty("backendWebsite", QLatin1String("http://qtsoftware.com/"));
     70    setProperty("backendWebsite", QLatin1String("http://qt.nokia.com/"));
     71#endif //QT_NO_PROPERTIES
    6472
    6573    //check if we should enable debug output
    … …  
    8593Backend::~Backend()
    8694{
    87     gst_deinit();
    8895}
    8996
    … …  
    118125            return ao;
    119126        }
     127#ifndef QT_NO_PHONON_EFFECT
    120128    case EffectClass:
    121129        return new AudioEffect(this, args[0].toInt(), parent);
    122 
     130#endif //QT_NO_PHONON_EFFECT
    123131    case AudioDataOutputClass:
    124132        logMessage("createObject() : AudioDataOutput not implemented");
    125133        break;
    126134
     135#ifndef QT_NO_PHONON_VIDEO
    127136    case VideoDataOutputClass:
    128137        logMessage("createObject() : VideoDataOutput not implemented");
    … …  
    133142            return new VideoWidget(this, widget);
    134143        }
    135 
     144#endif //QT_NO_PHONON_VIDEO
     145#ifndef QT_NO_PHONON_VOLUMEFADEREFFECT
    136146    case VolumeFaderEffectClass:
    137147        return new VolumeFaderEffect(this, parent);
     148#endif //QT_NO_PHONON_VOLUMEFADEREFFECT
    138149
    139150    case VisualizationClass:  //Fall through
    … …  
    204215        QString klass = gst_element_factory_get_klass(GST_ELEMENT_FACTORY(feature));
    205216
    206         if (klass == QLatin1String("Codec/Decoder/Audio") ||
    207             klass == QLatin1String("Codec/Decoder/Video")) {
     217        if (klass == QLatin1String("Codec/Decoder") ||
     218            klass == QLatin1String("Codec/Decoder/Audio") ||
     219            klass == QLatin1String("Codec/Decoder/Video") ||
     220            klass == QLatin1String("Codec/Demuxer") ||
     221            klass == QLatin1String("Codec/Demuxer/Audio") ||
     222            klass == QLatin1String("Codec/Demuxer/Video") ||
     223            klass == QLatin1String("Codec/Parser") ||
     224            klass == QLatin1String("Codec/Parser/Audio") ||
     225            klass == QLatin1String("Codec/Parser/Video")) {
    208226
    209227            const GList *static_templates;
    … …  
    277295    case Phonon::AudioOutputDeviceType: {
    278296            QList<AudioDevice> audioDevices = deviceManager()->audioOutputDevices();
    279             if (index >= 0 && index < audioDevices.size()) {
    280                 ret.insert("name", audioDevices[index].gstId);
    281                 ret.insert("description", audioDevices[index].description);
    282                 ret.insert("icon", QLatin1String("audio-card"));
     297            foreach(const AudioDevice &device, audioDevices) {
     298                if (device.id == index) {
     299                    ret.insert("name", device.gstId);
     300                    ret.insert("description", device.description);
     301                    ret.insert("icon", QLatin1String("audio-card"));
     302                    break;
     303                }
    283304            }
    284305        }

  • trunk/src/3rdparty/phonon/gstreamer/devicemanager.cpp

    r2 r561  
    7373        , m_backend(backend)
    7474{
     75    m_audioSink = qgetenv("PHONON_GST_AUDIOSINK");
     76    m_videoSinkWidget = qgetenv("PHONON_GST_VIDEOMODE");
     77
     78#ifndef QT_NO_SETTINGS
    7579    QSettings settings(QLatin1String("Trolltech"));
    7680    settings.beginGroup(QLatin1String("Qt"));
    7781
    78     m_audioSink = qgetenv("PHONON_GST_AUDIOSINK");
    7982    if (m_audioSink.isEmpty()) {
    8083        m_audioSink = settings.value(QLatin1String("audiosink"), "Auto").toByteArray().toLower();
    8184    }
    8285
    83     m_videoSinkWidget = qgetenv("PHONON_GST_VIDEOMODE");
    8486    if (m_videoSinkWidget.isEmpty()) {
    8587        m_videoSinkWidget = settings.value(QLatin1String("videomode"), "Auto").toByteArray().toLower();
    8688    }
     89#endif //QT_NO_SETTINGS
    8790
    8891    if (m_backend->isValid())
    … …  
    244247}
    245248
     249#ifndef QT_NO_PHONON_VIDEO
    246250AbstractRenderer *DeviceManager::createVideoRenderer(VideoWidget *parent)
    247251{
    … …  
    266270    return new WidgetRenderer(parent);
    267271}
     272#endif //QT_NO_PHONON_VIDEO
    268273
    269274/*

  • trunk/src/3rdparty/phonon/gstreamer/effect.cpp

    r2 r561  
    2626#include <gst/gst.h>
    2727
     28#ifndef QT_NO_PHONON_EFFECT
    2829QT_BEGIN_NAMESPACE
    29 
    3030namespace Phonon
    3131{
    … …  
    242242}
    243243} //namespace Phonon::Gstreamer
    244 
    245244QT_END_NAMESPACE
     245#endif //QT_NO_PHONON_EFFECT
    246246#include "moc_effect.cpp"

  • trunk/src/3rdparty/phonon/gstreamer/effect.h

    r2 r561  
    2929#include <gst/gst.h>
    3030
     31#ifndef QT_NO_PHONON_EFFECT
    3132QT_BEGIN_NAMESPACE
    32 
    3333namespace Phonon
    3434{
    … …  
    5959    };
    6060}} //namespace Phonon::Gstreamer
    61 
    6261QT_END_NAMESPACE
     62#endif //QT_NO_PHONON_EFFECT
    6363
    6464#endif // Phonon_GSTREAMER_EFFECT_H

  • trunk/src/3rdparty/phonon/gstreamer/mediaobject.cpp

    r2 r561  
    8888
    8989    if (!m_backend->isValid()) {
    90         setError(tr("Cannot start playback. \n\nCheck your Gstreamer installation and make sure you "
     90        setError(tr("Cannot start playback. \n\nCheck your GStreamer installation and make sure you "
    9191                    "\nhave libgstreamer-plugins-base installed."), Phonon::FatalError);
    9292    } else {
    … …  
    9696        connect(m_tickTimer, SIGNAL(timeout()), SLOT(emitTick()));
    9797    }
    98     connect(this, SIGNAL(stateChanged(Phonon::State, Phonon::State)),
    99             this, SLOT(notifyStateChange(Phonon::State, Phonon::State)));
     98    connect(this, SIGNAL(stateChanged(Phonon::State,Phonon::State)),
     99            this, SLOT(notifyStateChange(Phonon::State,Phonon::State)));
    100100
    101101}
    … …  
    227227
    228228    // These functions require GStreamer > 0.10.12
     229#ifndef QT_NO_LIBRARY
    229230    static Ptr_gst_pb_utils_init p_gst_pb_utils_init = 0;
    230231    static Ptr_gst_pb_utils_get_codec_description p_gst_pb_utils_get_codec_description = 0;
    … …  
    240241        value = QString::fromUtf8(codecName);
    241242        g_free (codecName);
    242     } else {
     243    } else
     244#endif //QT_NO_LIBRARY
     245    {
    243246        // For GStreamer versions < 0.10.12
    244247        GstStructure *str = gst_caps_get_structure (caps, 0);
    245248        value = QString::fromUtf8(gst_structure_get_name (str));
     249
    246250    }
    247251    media->addMissingCodecName(value);
    … …  
    341345    GstPad *decodepad = static_cast<GstPad*>(data);
    342346    gst_pad_link (pad, decodepad);
    343     gst_object_unref (decodepad);
     347    //gst_object_unref (decodepad);
    344348}
    345349
    … …  
    369373    if (!m_datasource)
    370374        return false;
     375
     376    // Set the device for MediaSource::Disc
     377    if (m_source.type() == MediaSource::Disc) {
     378
     379        if (g_object_class_find_property (G_OBJECT_GET_CLASS (m_datasource), "device")) {
     380            QByteArray mediaDevice = QFile::encodeName(m_source.deviceName());
     381            if (!mediaDevice.isEmpty())
     382                g_object_set (G_OBJECT (m_datasource), "device", mediaDevice.constData(), (const char*)NULL);
     383        }
     384
     385        // Also Set optical disc speed to 2X for Audio CD
     386        if (m_source.discType() == Phonon::Cd
     387            && (g_object_class_find_property (G_OBJECT_GET_CLASS (m_datasource), "read-speed"))) {
     388            g_object_set (G_OBJECT (m_datasource), "read-speed", 2, (const char*)NULL);
     389            m_backend->logMessage(QString("new device speed : 2X"), Backend::Info, this);
     390        }
     391    }
    371392
    372393    // Link data source into pipeline
    … …  
    388409bool MediaObject::createPipefromStream(const MediaSource &source)
    389410{
     411#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
    390412    // Remove any existing data source
    391413    if (m_datasource) {
    … …  
    409431    }
    410432    return true;
     433#else //QT_NO_PHONON_ABSTRACTMEDIASTREAM
     434    Q_UNUSED(source);
     435    return false;
     436#endif
    411437}
    412438
    … …  
    903929        break;
    904930
    905     case MediaSource::Disc: // CD tracks can be specified by setting the url in the following way uri=cdda:4
     931    case MediaSource::Disc:
    906932        {
    907             QUrl cdurl(QLatin1String("cdda://"));
    908             if (createPipefromURL(cdurl))
     933            QString mediaUrl;
     934            switch (source.discType()) {
     935            case Phonon::NoDisc:
     936                qWarning() << "I should never get to see a MediaSource that is a disc but doesn't specify which one";
     937                return;
     938            case Phonon::Cd:  // CD tracks can be specified by setting the url in the following way uri=cdda:4
     939                mediaUrl = QLatin1String("cdda://");
     940                break;
     941            case Phonon::Dvd:
     942                mediaUrl = QLatin1String("dvd://");
     943                break;
     944            case Phonon::Vcd:
     945                mediaUrl = QLatin1String("vcd://");
     946                break;
     947            default:
     948                qWarning() <<  "media " << source.discType() << " not implemented";
     949                return;
     950            }
     951            if (!mediaUrl.isEmpty() && createPipefromURL(QUrl(mediaUrl)))
    909952                m_loading = true;
    910953            else
    … …  
    9661009    GstFormat format = gst_format_get_by_nick("track");
    9671010    if (gst_element_query_duration (m_pipeline, &format, &titleCount)) {
    968         int oldAvailableTitles = m_availableTitles;
    969         m_availableTitles = (int)titleCount;
    970         if (m_availableTitles != oldAvailableTitles) {
    971             emit availableTitlesChanged(m_availableTitles);
    972             m_backend->logMessage(QString("Available titles changed: %0").arg(m_availableTitles), Backend::Info, this);
     1011        //check if returned format is still "track",
     1012        //gstreamer sometimes returns the total time, if tracks information is not available.
     1013        if (qstrcmp(gst_format_get_name(format), "track") == 0)  {
     1014            int oldAvailableTitles = m_availableTitles;
     1015            m_availableTitles = (int)titleCount;
     1016            if (m_availableTitles != oldAvailableTitles) {
     1017                emit availableTitlesChanged(m_availableTitles);
     1018                m_backend->logMessage(QString("Available titles changed: %0").arg(m_availableTitles), Backend::Info, this);
     1019            }
    9731020        }
    9741021    }

  • trunk/src/3rdparty/phonon/gstreamer/phononsrc.cpp

    r2 r561  
    110110{
    111111    Q_UNUSED(g_class);
     112#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
    112113    src->device = 0;
     114#else
     115    Q_UNUSED(src);
     116#endif
    113117}
    114118
    115119static void phonon_src_finalize (GObject * object)
    116120{
     121#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
    117122    PhononSrc *src;
    118123    src = GST_PHONON_SRC (object);
    119124    delete src->device;
    120125    src->device = 0;
     126#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
    121127    G_OBJECT_CLASS (parent_class)->finalize (object);
    122128}
    123129
     130#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
    124131static gboolean phonon_src_set_device(PhononSrc * src, StreamReader* device)
    125132{
    … …  
    146153    }
    147154}
     155#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
    148156
    149157static void phonon_src_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec)
    … …  
    154162
    155163    switch (prop_id) {
     164#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
    156165    case ARG_PHONONSRC:
    157166    {
    … …  
    161170        break;
    162171    }
     172#else
     173    Q_UNUSED(value);
     174#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
    163175   default:
    164176       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
    … …  
    175187
    176188    switch (prop_id) {
     189#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
    177190    case ARG_PHONONSRC:
    178191        g_value_set_pointer(value, src->device);
    179192        break;
     193#else //QT_NO_PHONON_ABSTRACTMEDIASTREAM
     194    Q_UNUSED(value);
     195#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
    180196    default:
    181197        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
    … …  
    186202static GstFlowReturn phonon_src_create_read (PhononSrc * src, guint64 offset, guint length, GstBuffer ** buffer)
    187203{
     204#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
    188205    Q_ASSERT(src->device);
    189206    if (!src->device)
    … …  
    205222    gst_mini_object_unref(GST_MINI_OBJECT(buf));
    206223    return GST_FLOW_ERROR;
     224#else //QT_NO_PHONON_ABSTRACTMEDIASTREAM
     225    Q_UNUSED(src);
     226    Q_UNUSED(offset);
     227    Q_UNUSED(length);
     228    Q_UNUSED(buffer);
     229    return GST_FLOW_ERROR;
     230#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
    207231}
    208232
    … …  
    219243{
    220244    PhononSrc *src = GST_PHONON_SRC (basesrc);
     245#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
    221246    if (src->device)
    222247        return src->device->streamSeekable();
     248#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
    223249    return false;
    224250}
    … …  
    226252static gboolean phonon_src_get_size (GstBaseSrc * basesrc, guint64 * size)
    227253{
     254#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
    228255    PhononSrc *src;
    229256    src = GST_PHONON_SRC (basesrc);
    … …  
    232259        return TRUE;
    233260    }
     261#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
    234262    *size = 0;
    235263    return FALSE;

  • trunk/src/3rdparty/phonon/gstreamer/phononsrc.h

    r2 r561  
    5050struct _PhononSrc {
    5151    GstBaseSrc element;
     52#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
    5253    StreamReader *device;
     54#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
    5355};
    5456

  • trunk/src/3rdparty/phonon/gstreamer/streamreader.cpp

    r2 r561  
    2121
    2222QT_BEGIN_NAMESPACE
    23 
     23#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
    2424namespace Phonon
    2525{
    … …  
    5050}
    5151}
     52#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
    5253
    5354QT_END_NAMESPACE

  • trunk/src/3rdparty/phonon/gstreamer/streamreader.h

    r2 r561  
    2323
    2424QT_BEGIN_NAMESPACE
     25
     26#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
    2527
    2628namespace Phonon
    … …  
    9294}
    9395
     96#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
     97
    9498QT_END_NAMESPACE
    9599

  • trunk/src/3rdparty/phonon/gstreamer/videowidget.cpp

    r2 r561  
    3434#include "x11renderer.h"
    3535
     36#ifndef QT_NO_PHONON_VIDEO
    3637QT_BEGIN_NAMESPACE
    3738
    … …  
    384385
    385386QT_END_NAMESPACE
     387#endif //QT_NO_PHONON_VIDEO
    386388
    387389#include "moc_videowidget.cpp"

  • trunk/src/3rdparty/phonon/gstreamer/videowidget.h

    r2 r561  
    2929#include <gst/gst.h>
    3030
     31#ifndef QT_NO_PHONON_VIDEO
    3132QT_BEGIN_NAMESPACE
    3233
    … …  
    103104
    104105QT_END_NAMESPACE
    105 
     106#endif //QT_NO_PHONON_VIDEO
    106107#endif // Phonon_GSTREAMER_VIDEOWIDGET_H

  • trunk/src/3rdparty/phonon/gstreamer/volumefadereffect.cpp

    r2 r561  
    2222QT_BEGIN_NAMESPACE
    2323
     24#ifndef QT_NO_PHONON_VOLUMEFADEREFFECT
    2425namespace Phonon
    2526{
    2627namespace Gstreamer
    2728{
    28 
    2929VolumeFaderEffect::VolumeFaderEffect(Backend *backend, QObject *parent)
    3030    : Effect(backend, parent, AudioSource | AudioSink)
    … …  
    157157
    158158}} //namespace Phonon::Gstreamer
    159 
     159#endif //QT_NO_PHONON_VOLUMEFADEREFFECT
    160160QT_END_NAMESPACE
    161161

  • trunk/src/3rdparty/phonon/gstreamer/volumefadereffect.h

    r2 r561  
    3131
    3232QT_BEGIN_NAMESPACE
    33 
     33#ifndef QT_NO_PHONON_VOLUMEFADEREFFECT
    3434namespace Phonon
    3535{
    … …  
    6565    };
    6666}} //namespace Phonon::Gstreamer
    67 
     67#endif //QT_NO_PHONON_VOLUMEFADEREFFECT
    6868QT_END_NAMESPACE
    6969

  • trunk/src/3rdparty/phonon/gstreamer/widgetrenderer.cpp

    r2 r561  
    3333#endif
    3434
     35#ifndef QT_NO_PHONON_VIDEO
    3536QT_BEGIN_NAMESPACE
    3637
    … …  
    149150
    150151QT_END_NAMESPACE
     152#endif //QT_NO_PHONON_VIDEO

  • trunk/src/3rdparty/phonon/gstreamer/widgetrenderer.h

    r2 r561  
    2727#endif
    2828
     29#ifndef QT_NO_PHONON_VIDEO
    2930QT_BEGIN_NAMESPACE
    3031
    … …  
    6061
    6162QT_END_NAMESPACE
    62 
     63#endif //QT_NO_PHONON_VIDEO
    6364#endif // Phonon_GSTREAMER_WIDGETRENDERER_H
Note: See TracChangeset for help on using the changeset viewer.