← Back to branch summary

~ubuntu-branches/debian/sid/amoeba/sid

« back to all changes in this revision

Viewing changes to main/linux-config/linux-config.cpp

  • Committer: Package Import Robot
  • Author(s): Steinar H. Gunderson
  • Date: 2015-05-01 20:22:46 UTC
  • Revision ID: package-import@ubuntu.com-20150501202246-ylvg3md4v6swcokb
Tags: 1.1-29
26-alsa-support.diff: Only try to compile ALSA support if the headers have
new enough API; will prevent us from trying to compile against OSS4's
ALSA emulation (which has an ancient version) on non-Linux platforms.
Fixes FTBFS on Hurd and FreeBSD. (We still link against the library,
although then uselessly on those platforms.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
main/linux-config/linux-config.cpp
455
455
                (*_gtk_menu_shell_append) (GTK_MENU (soundmenu_menu), glade_menuitem);
456
456
        }
457
457
 
 
458
#if DEMOLIB_USE_ALSA
458
459
        std::vector<ALSAAudioDriver::ALSASoundCard> alsa_cards = ALSAAudioDriver::enumerate_sound_cards();
459
460
        for (unsigned i = 0; i < alsa_cards.size(); ++i) {
460
461
                glade_menuitem = (*_gtk_menu_item_new_with_label) (strdup(alsa_cards[i].description.c_str()));
462
463
                (*_gtk_widget_show) (glade_menuitem);
463
464
                (*_gtk_menu_shell_append) (GTK_MENU (soundmenu_menu), glade_menuitem);
464
465
        }
 
466
#endif
465
467
        
466
468
        glade_menuitem = (*_gtk_menu_item_new_with_label) ("No sound");
467
469
        (*_gtk_object_set_data) (GTK_OBJECT (glade_menuitem), strdup("sound"), strdup(""));