From ef04f2914a503600d486338f4e9bee1d4f01848d Mon Sep 17 00:00:00 2001 From: freem Date: Fri, 5 Sep 2014 03:43:00 -0500 Subject: [PATCH 1/2] Replace the usage of SOUND_PCM_WRITE_RATE with SNDCTL_DSP_SPEED. (See issue #292) --- src/arch/Sound/RageSoundDriver_OSS.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arch/Sound/RageSoundDriver_OSS.cpp b/src/arch/Sound/RageSoundDriver_OSS.cpp index 1c75d5454e..06d1737a98 100644 --- a/src/arch/Sound/RageSoundDriver_OSS.cpp +++ b/src/arch/Sound/RageSoundDriver_OSS.cpp @@ -187,8 +187,8 @@ RString RageSoundDriver_OSS::Init() return ssprintf( "RageSoundDriver_OSS: Wanted %i channels, got %i instead", channels, i ); i = 44100; - if(ioctl(fd, SOUND_PCM_WRITE_RATE, &i) == -1 ) - return ssprintf( "RageSoundDriver_OSS: ioctl(SOUND_PCM_WRITE_RATE, %i): %s", i, strerror(errno) ); + if(ioctl(fd, SNDCTL_DSP_SPEED, &i) == -1 ) + return ssprintf( "RageSoundDriver_OSS: ioctl(SNDCTL_DSP_SPEED, %i): %s", i, strerror(errno) ); samplerate = i; LOG->Trace("RageSoundDriver_OSS: sample rate %i", samplerate); i = (num_chunks << 16) + chunk_order; From d6205f2b841733985742dbbbb0ad1c7e119479a0 Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Sat, 6 Sep 2014 17:00:41 -0700 Subject: [PATCH 2/2] SM5 beta 4 version bump + url updates --- src/ProductInfo.h | 6 +++--- src/ProductInfo.inc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ProductInfo.h b/src/ProductInfo.h index db29722eb5..e6d1774760 100644 --- a/src/ProductInfo.h +++ b/src/ProductInfo.h @@ -30,7 +30,7 @@ * */ #ifndef PRODUCT_VER_BARE -#define PRODUCT_VER_BARE v5.0 beta 3 +#define PRODUCT_VER_BARE v5.0 beta 4 #endif /** @@ -49,10 +49,10 @@ #define PRODUCT_VER PRODUCT_XSTRINGIFY(PRODUCT_VER_BARE) #define PRODUCT_ID_VER PRODUCT_XSTRINGIFY(PRODUCT_ID_VER_BARE) -#define VIDEO_TROUBLESHOOTING_URL "http://www.stepmania.com/stepmaniawiki.php?title=Video_Driver_Troubleshooting" +#define VIDEO_TROUBLESHOOTING_URL "http://old.stepmania.com/stepmaniawiki.php?title=Video_Driver_Troubleshooting" /** @brief The URL to report bugs on the program. */ #define REPORT_BUG_URL "https://github.com/stepmania/stepmania/issues" -#define SM_DOWNLOAD_URL "http://www.stepmania.com/wiki/Downloads" +#define SM_DOWNLOAD_URL "http://www.stepmania.com/download/" #define CAN_INSTALL_PACKAGES true diff --git a/src/ProductInfo.inc b/src/ProductInfo.inc index 0f27a40e4e..6538641bbe 100644 --- a/src/ProductInfo.inc +++ b/src/ProductInfo.inc @@ -7,12 +7,12 @@ ; PRODUCT_ID must NOT be "StepMania" unless you want people to uninstall 3.9 ; when they install StepMania 5. (not recommended) !define PRODUCT_ID "StepMania 5" -!define PRODUCT_VER "v5.0 beta 3" +!define PRODUCT_VER "v5.0 beta 4" !define PRODUCT_DISPLAY "${PRODUCT_FAMILY} ${PRODUCT_VER}" !define PRODUCT_BITMAP "sm5" !define PRODUCT_URL "http://www.stepmania.com/" -!define UPDATES_URL "http://www.stepmania.com/wiki/Downloads" +!define UPDATES_URL "http://www.stepmania.com/download/" ;!define INSTALL_EXTERNAL_PCKS ;!define INSTALL_INTERNAL_PCKS