← Back to branch summary

~ubuntu-branches/ubuntu/saucy/dosbox/saucy

« back to all changes in this revision

Viewing changes to src/dosbox.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jan Dittberner
  • Date: 2009-12-05 19:37:29 UTC
  • mfrom: (1.1.7 upstream) (4.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091205193729-aa7a0joau2x907p8
Tags: 0.73+dfsg1-1
http://bugs.debian.org/559443
* remove src/hardware/ymf262.c, src/hardware/ymf262.h, add
  debian/patches/remove_ymf262_code.patch to remove dependencies on
  ymf262.{c,h}, update debian/patches/series and debian/README.source
  (Closes: #559443)
* debian/copyright: refer to GPL-2 explicitly
* debian/watch: add opts=dversionmangle to calculate correct upstream
  version
* incorporate upstream suggestions:
  - remove debian/patches/bios_keyboard.cpp.patch, upstream uses
    putenv("SDL_DISABLE_LOCK_KEYS=1") in src/gui/sdlmain.cpp, update
    debian/patches/series
  - remove debian/dosbox.conf.example because dosbox creates a
    configuration file automatically if it does not exist, update
    debian/docs and debian/README.Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dosbox.cpp
509
509
        Pstring->Set_values(oplmodes);
510
510
        Pstring->Set_help("Type of OPL emulation. On 'auto' the mode is determined by sblaster type. All OPL modes are Adlib-compatible, except for 'cms'.");
511
511
 
512
 
        const char* oplemus[]={ "default", "compat", "fast", "old", 0};
 
512
        const char* oplemus[]={ "default", "compat", "fast", 0};
513
513
        Pstring = secprop->Add_string("oplemu",Property::Changeable::WhenIdle,"default");
514
514
        Pstring->Set_values(oplemus);
515
 
        Pstring->Set_help("Provider for the OPL emulation. compat or old might provide better quality (see oplrate as well).");
 
515
        Pstring->Set_help("Provider for the OPL emulation. compat might provide better quality (see oplrate as well).");
516
516
 
517
517
        Pint = secprop->Add_int("oplrate",Property::Changeable::WhenIdle,22050);
518
518
        Pint->Set_values(oplrates);