[Gemrb-commits] gemrb/gemrb/plugins/Core Interface.cpp,1.24,1.25 Interface.h,1.15,1.16 MusicMgr.h,1.2,1.3 SoundMgr.h,1.2,1.3

[<bal...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core
In directory sc8-pr-cvs1:/tmp/cvs-serv5588/gemrb/plugins/Core

Modified Files:
	Interface.cpp Interface.h MusicMgr.h SoundMgr.h 
Log Message:
MUSImporter Update, not really working, but plays music :)

Index: Interface.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Interface.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Interface.cpp	27 Oct 2003 11:28:12 -0000	1.24
--- Interface.cpp	27 Oct 2003 11:38:26 -0000	1.25
***************
*** 33,36 ****
--- 33,37 ----
  	windowmgr = NULL;
  	vars = NULL;
+ 	music = NULL;
  	ConsolePopped = false;
  	printMessage("Core", "Loading Configuration File...", WHITE);
***************
*** 83,86 ****
--- 84,89 ----
  	if(vars)
  		delete(vars);
+ 	if(music)
+ 		delete(music);
  	delete(console);
  	delete(plugin);
***************
*** 215,218 ****
--- 218,222 ----
  	}
  	if(!guiscript->Init()) {
+ 		
  		printStatus("ERROR", LIGHT_RED);
  		return GEM_ERROR;
***************
*** 248,251 ****
--- 252,262 ----
  	}
  	printStatus("OK", LIGHT_GREEN);
+ 	printMessage("Core", "Initializing Music Manager...", WHITE);
+ 	music = (MusicMgr*)GetInterface(IE_MUS_CLASS_ID);
+ 	if(!music) {
+ 		printStatus("ERROR", LIGHT_RED);
+ 		return GEM_ERROR;
+ 	}
+ 	printStatus("OK", LIGHT_GREEN);
  	printMessage("Core", "Core Initialization Complete!\n", LIGHT_GREEN);
  	return GEM_OK;
***************
*** 750,752 ****
--- 761,768 ----
  {
  	return vars;
+ }
+ /** Get the Music Manager */
+ MusicMgr * Interface::GetMusicMgr()
+ {
+ 	return music;
  }

Index: Interface.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Interface.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Interface.h	26 Oct 2003 15:29:27 -0000	1.15
--- Interface.h	27 Oct 2003 11:38:26 -0000	1.16
***************
*** 22,25 ****
--- 22,26 ----
  #include "SoundMgr.h"
  #include "Variables.h"
+ #include "MusicMgr.h"
  
  #ifdef WIN32
***************
*** 56,59 ****
--- 57,61 ----
  	std::vector<Window*> windows;
  	Variables * vars;
+ 	MusicMgr * music;
  public:
  	Interface(void);
***************
*** 108,111 ****
--- 110,115 ----
  	/** Get the Variables Dictionary */
  	Variables * GetDictionary();
+ 	/** Get the Music Manager */
+ 	MusicMgr * GetMusicMgr();
  private:
  	bool LoadConfig(void);

Index: MusicMgr.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/MusicMgr.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MusicMgr.h	27 Oct 2003 11:28:12 -0000	1.2
--- MusicMgr.h	27 Oct 2003 11:38:26 -0000	1.3
***************
*** 52,55 ****
--- 52,57 ----
    /** Switches the current PlayList while playing the current one */
    virtual void SwitchPlayList(const char * name) = 0;
+   /** Plays the Next Entry */
+   virtual void PlayNext() = 0;
  };
  

Index: SoundMgr.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/SoundMgr.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SoundMgr.h	24 Oct 2003 19:12:20 -0000	1.2
--- SoundMgr.h	27 Oct 2003 11:38:26 -0000	1.3
***************
*** 23,26 ****
--- 23,29 ----
  	virtual bool Init(void) = 0;
  	virtual unsigned long Play(const char * ResRef) = 0;
+ 	virtual unsigned long LoadFile(const char * filename) = 0;
+ 	virtual bool Stop(unsigned long index) = 0;
+ 	virtual bool Play(unsigned long index) = 0;
  };