Ticket #6476: mythtv-pulseaudio_ifdefs-fix_compile_with_pulse_disabled.patch

File mythtv-pulseaudio_ifdefs-fix_compile_with_pulse_disabled.patch, 1.4 KB (added by sphery <mtdean@…>, 11 years ago)
  • programs/mythtv/main.cpp

     
    201201   
    202202    GetMythUI()->LoadQtConfig();
    203203
     204#ifdef USING_PULSE
    204205    int pa_ret = pulseaudio_handle_startup();
    205206    if (pa_ret != GENERIC_EXIT_OK)
    206207        return pa_ret;
     208#endif
    207209
    208210#if defined(Q_OS_MACX)
    209211    // Mac OS X doesn't define the AudioOutputDevice setting
     
    262264    delete theme;
    263265    delete gContext;
    264266
     267#ifdef USING_PULSE
    265268    pa_ret = pulseaudio_handle_teardown();
    266269    if (GENERIC_EXIT_OK != pa_ret)
    267270        return pa_ret;
     271#endif
    268272
    269273    return TV_EXIT_OK;
    270274}
  • programs/mythfrontend/main.cpp

     
    11601160    }
    11611161    QMap<QString,QString> settingsOverride = cmdline.GetSettingsOverride();
    11621162
     1163#ifdef USING_PULSE
    11631164    int pa_ret = pulseaudio_handle_startup();
    11641165    if (pa_ret != GENERIC_EXIT_OK)
    11651166        return pa_ret;
     1167#endif
    11661168
    11671169    if (logfile.size())
    11681170    {
     
    14791481
    14801482    DestroyMythMainWindow();
    14811483
     1484#ifdef USING_PULSE
    14821485    pa_ret = pulseaudio_handle_teardown();
    14831486    if (GENERIC_EXIT_OK != pa_ret)
    14841487        return pa_ret;
     1488#endif
    14851489
    14861490    return FRONTEND_EXIT_OK;
    14871491