[code/core] Some Music additions...

[Durante]

I just made some trivial additions to the Music object, here's the code in a zip (sound.h, sound.c, luasound.c):
http://peter.metaclassofnil.com/stuff/p ... update.zip

These are non-breaking changes (well, compared to some of my recent graphics stuff, everything is...) so they should be easy to add to the svn version. Note that only the bpm stuff is tested as of now, but I'll get to the other functions soon and I don't believe that there's an easy way to mess up such simple stuff ;).

For completeness, here are the added parts. I even documented them o_O
sound.h:

Code: Select all

/**
 * Sets the music's beats per minute.
 * 
 * @pre &#40;arg > 33 && arg < 240&#41;
 * @param arg is the number of bpm
 * @return the old bpm
 */
extern unsigned setMusicBPM&#40;unsigned arg&#41;;
/**
 * Gets the music's current beats per minute.
 * 
 * @return the bpm
 */
extern unsigned getMusicBPM&#40;&#41;;
/**
 * Gets the music's initial beats per minute.
 * 
 * @return the initial bpm of the current music file
 */
extern unsigned getMusicInitBPM&#40;&#41;;

/**
 * Sets the music's current position. All playing samples are cut off.
 * 
 * @pre &#40;arg < getMusicMaxPosition&#40;&#41;&#41;
 * @param arg is the position you want to set
 * @return the old position
 */
extern unsigned setMusicPosition&#40;unsigned arg&#41;;
/**
 * Gets the music's current pattern position.
 * 
 * @return the position
 */
extern unsigned getMusicPosition&#40;&#41;;
/**
 * Gets the music's last pattern position.
 * 
 * @return the last position of the current music file
 */
extern unsigned getMusicMaxPosition&#40;&#41;;

/**
 * Sets the music's positionto the current postion + 1.
 */
extern void nextMusicPosition&#40;&#41;;
/**
 * Sets the music's positionto the current postion - 1.
 */
extern void prevMusicPosition&#40;&#41;;

sound.c:

Code: Select all

unsigned setMusicBPM(unsigned arg) {
	unsigned ret = musichandle->bpm;
	arg = &#40;arg<33&#41; ? 33 &#58; arg;
	arg = &#40;arg>240&#41; ? 240 &#58; arg;
	musichandle->bpm = arg;
	return ret;
&#125;
unsigned getMusicBPM&#40;&#41; &#123;
	return musichandle->bpm;
&#125;
unsigned getMusicInitBPM&#40;&#41; &#123;
	return musichandle->inittempo;
&#125;

unsigned setMusicPosition&#40;unsigned arg&#41; &#123;
	unsigned ret = musichandle->sngpos;
	arg = &#40;arg>=musichandle->numpos&#41; ? musichandle->numpos-1 &#58; arg;
	Player_SetPosition&#40;arg&#41;;
	return ret;
&#125;
unsigned getMusicPosition&#40;&#41; &#123;
	return musichandle->sngpos;
&#125;
unsigned getMusicMaxPosition&#40;&#41; &#123;
	return musichandle->numpos-1;
&#125;

void nextMusicPosition&#40;&#41; &#123;
	Player_NextPosition&#40;&#41;;
&#125;
void prevMusicPosition&#40;&#41; &#123;
	Player_PrevPosition&#40;&#41;;
&#125;

luasound.c:

Code: Select all

static int Music_bpm(lua_State *L)
{
	int argc = lua_gettop(L);
	if(argc != 1 && argc != 0) return luaL_error(L, "wrong number of arguments");
	if(argc)
		lua_pushnumber(L, setMusicBPM(luaL_checknumber(L, 1)));
	else
		lua_pushnumber(L, getMusicBPM());

	return 1;
}
static int Music_initialBpm(lua_State *L)
{
	int argc = lua_gettop(L);
	if(argc != 0) return luaL_error(L, "wrong number of arguments");
	lua_pushnumber(L, getMusicInitBPM());

	return 1;
}

static int Music_position(lua_State *L)
{
	int argc = lua_gettop(L);
	if(argc != 1 && argc != 0) return luaL_error(L, "wrong number of arguments");
	if(argc)
		lua_pushnumber(L, setMusicPosition(luaL_checknumber(L, 1)));
	else
		lua_pushnumber(L, getMusicPosition());

	return 1;
}
static int Music_maxPosition(lua_State *L)
{
	int argc = lua_gettop(L);
	if(argc != 0) return luaL_error(L, "wrong number of arguments");
	lua_pushnumber(L, getMusicMaxPosition());

	return 1;
}

static int Music_nextPosition(lua_State *L)
{
	int argc = lua_gettop(L);
	if(argc != 0) return luaL_error(L, "wrong number of arguments");
	nextMusicPosition();

	return 0;
}
static int Music_prevPosition(lua_State *L)
{
	int argc = lua_gettop(L);
	if(argc != 0) return luaL_error(L, "wrong number of arguments");
	prevMusicPosition();

	return 0;
}



static const luaL_reg Music_functions[] = {
  {"playFile",          Music_loadAndPlay},
  {"stop",           	Music_StopAndUnload},
  {"pause",		 		Music_pause},
  {"resume",	 		Music_resume},
  {"playing", 			Music_playing},
  {"volume", 			Music_volume},
  {"bpm",			Music_bpm},
  {"initialBpm",		Music_initialBpm},
  {"position",			Music_position},
  {"maxPosition",		Music_maxPosition},
  {"nextPosition",		Music_nextPosition},
  {"prevPosition",		Music_prevPosition},
  {0, 0}
};