actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/stepmania/stepmania

Browse Source
This commit is contained in:
Jonathan Payne
2014-09-07 01:53:11 -07:00
parent f5c7147eeb d6205f2b84
commit 15a9625b68
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ProductInfo.h
+3 -3
View File
@@ -30,7 +30,7 @@
* </li></ul> * </li></ul>
*/ */
#ifndef PRODUCT_VER_BARE #ifndef PRODUCT_VER_BARE
#define PRODUCT_VER_BARE v5.0 beta 3 #define PRODUCT_VER_BARE v5.0 beta 4
#endif #endif
/** /**
@@ -49,10 +49,10 @@
#define PRODUCT_VER PRODUCT_XSTRINGIFY(PRODUCT_VER_BARE) #define PRODUCT_VER PRODUCT_XSTRINGIFY(PRODUCT_VER_BARE)
#define PRODUCT_ID_VER PRODUCT_XSTRINGIFY(PRODUCT_ID_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. */ /** @brief The URL to report bugs on the program. */
#define REPORT_BUG_URL "https://github.com/stepmania/stepmania/issues" #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 #define CAN_INSTALL_PACKAGES true
src/ProductInfo.inc
+2 -2
View File
@@ -7,12 +7,12 @@
; PRODUCT_ID must NOT be "StepMania" unless you want people to uninstall 3.9 ; PRODUCT_ID must NOT be "StepMania" unless you want people to uninstall 3.9
; when they install StepMania 5. (not recommended) ; when they install StepMania 5. (not recommended)
!define PRODUCT_ID "StepMania 5" !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_DISPLAY "${PRODUCT_FAMILY} ${PRODUCT_VER}"
!define PRODUCT_BITMAP "sm5" !define PRODUCT_BITMAP "sm5"
!define PRODUCT_URL "http://www.stepmania.com/" !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_EXTERNAL_PCKS
;!define INSTALL_INTERNAL_PCKS ;!define INSTALL_INTERNAL_PCKS
src/arch/Sound/RageSoundDriver_OSS.cpp
+2 -2
View File
@@ -187,8 +187,8 @@ RString RageSoundDriver_OSS::Init()
return ssprintf( "RageSoundDriver_OSS: Wanted %i channels, got %i instead", channels, i ); return ssprintf( "RageSoundDriver_OSS: Wanted %i channels, got %i instead", channels, i );
i = 44100; i = 44100;
if(ioctl(fd, SOUND_PCM_WRITE_RATE, &i) == -1 ) if(ioctl(fd, SNDCTL_DSP_SPEED, &i) == -1 )
return ssprintf( "RageSoundDriver_OSS: ioctl(SOUND_PCM_WRITE_RATE, %i): %s", i, strerror(errno) ); return ssprintf( "RageSoundDriver_OSS: ioctl(SNDCTL_DSP_SPEED, %i): %s", i, strerror(errno) );
samplerate = i; samplerate = i;
LOG->Trace("RageSoundDriver_OSS: sample rate %i", samplerate); LOG->Trace("RageSoundDriver_OSS: sample rate %i", samplerate);
i = (num_chunks << 16) + chunk_order; i = (num_chunks << 16) + chunk_order;