1 |
commit: 40673fb497d309653254f52ee9c04cf06de8a53c |
2 |
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Feb 29 11:09:30 2020 +0000 |
4 |
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru> |
5 |
CommitDate: Sat Feb 29 11:09:30 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=40673fb4 |
7 |
|
8 |
games-puzzle/laserreaction: remove package |
9 |
|
10 |
Unavailable sources, deprecated eclass. |
11 |
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> |
12 |
|
13 |
.../files/laserreaction-1.0-includes.patch | 55 --- |
14 |
.../files/laserreaction-1.0-makefile.patch | 33 -- |
15 |
.../files/laserreaction-1.0-misc.patch | 53 --- |
16 |
.../files/laserreaction-1.0-sound.patch | 498 --------------------- |
17 |
.../laserreaction/laserreaction-1.0.ebuild | 49 -- |
18 |
games-puzzle/laserreaction/metadata.xml | 8 - |
19 |
6 files changed, 696 deletions(-) |
20 |
|
21 |
diff --git a/games-puzzle/laserreaction/files/laserreaction-1.0-includes.patch b/games-puzzle/laserreaction/files/laserreaction-1.0-includes.patch |
22 |
deleted file mode 100644 |
23 |
index c48a7c3..0000000 |
24 |
--- a/games-puzzle/laserreaction/files/laserreaction-1.0-includes.patch |
25 |
+++ /dev/null |
26 |
@@ -1,55 +0,0 @@ |
27 |
-diff -Naur Font.cpp Font.cpp |
28 |
---- Font.cpp 2009-10-02 12:17:55.000000000 +0200 |
29 |
-+++ Font.cpp 2009-10-02 12:28:33.000000000 +0200 |
30 |
-@@ -1,6 +1,7 @@ |
31 |
- #include "Font.h" |
32 |
--#include <windows.h> |
33 |
--#include <gl/gl.h> |
34 |
-+//#include <windows.h> |
35 |
-+#include <GL/gl.h> |
36 |
-+#include <cstring> |
37 |
- Font::Font() |
38 |
- { |
39 |
- mScale = 1.0f; |
40 |
-diff -Naur Game.h Game.h |
41 |
---- Game.h 2009-10-02 12:17:55.000000000 +0200 |
42 |
-+++ Game.h 2009-10-02 12:26:36.000000000 +0200 |
43 |
-@@ -1,12 +1,12 @@ |
44 |
- #pragma once |
45 |
--#include <sdl.h> |
46 |
-+#include <SDL/SDL.h> |
47 |
- #ifdef WIN32 |
48 |
- #include <windows.h> |
49 |
- #endif |
50 |
--#include <gl/gl.h> |
51 |
--#include <il/il.h> |
52 |
--#include <il/ilu.h> |
53 |
--#include <il/ilut.h> |
54 |
-+#include <GL/gl.h> |
55 |
-+#include <IL/il.h> |
56 |
-+#include <IL/ilu.h> |
57 |
-+#include <IL/ilut.h> |
58 |
- #include "Timer.h" |
59 |
- #include "Button.h" |
60 |
- #include "FileIO.h" |
61 |
-diff -Naur Main.cpp Main.cpp |
62 |
---- Main.cpp 2009-10-02 12:17:55.000000000 +0200 |
63 |
-+++ Main.cpp 2009-10-02 12:26:47.000000000 +0200 |
64 |
-@@ -1,6 +1,6 @@ |
65 |
- #include "Game.h" |
66 |
- #include <iostream> |
67 |
--#include <tchar.h> |
68 |
-+//#include <tchar.h> |
69 |
- /*=================================*/ |
70 |
- /*= Main Entry =*/ |
71 |
- /*=================================*/ |
72 |
-diff -Naur Timer.h Timer.h |
73 |
---- Timer.h 2009-10-02 12:17:55.000000000 +0200 |
74 |
-+++ Timer.h 2009-10-02 12:26:12.000000000 +0200 |
75 |
-@@ -1,5 +1,5 @@ |
76 |
- #pragma once |
77 |
--#include <sdl.h> |
78 |
-+#include <SDL/SDL.h> |
79 |
- class Timer |
80 |
- { |
81 |
- private: |
82 |
|
83 |
diff --git a/games-puzzle/laserreaction/files/laserreaction-1.0-makefile.patch b/games-puzzle/laserreaction/files/laserreaction-1.0-makefile.patch |
84 |
deleted file mode 100644 |
85 |
index 66461cd..0000000 |
86 |
--- a/games-puzzle/laserreaction/files/laserreaction-1.0-makefile.patch |
87 |
+++ /dev/null |
88 |
@@ -1,33 +0,0 @@ |
89 |
-diff -Naur Makefile Makefile |
90 |
---- Makefile 1970-01-01 01:00:00.000000000 +0100 |
91 |
-+++ Makefile 2009-10-02 12:20:08.000000000 +0200 |
92 |
-@@ -0,0 +1,29 @@ |
93 |
-+CPP = g++ |
94 |
-+CFLAGS = -O2 -g -Wno-deprecated |
95 |
-+INCLUDES = -I/usr/include/ -I./ -I/usr/include/GL |
96 |
-+LDFLAGS = -lGL -lGLU -lILUT -ILU -lIL -lfmod |
97 |
-+ |
98 |
-+DEST = . |
99 |
-+ |
100 |
-+LD = gcc |
101 |
-+ |
102 |
-+SDL_LDFLAGS = $(shell sdl-config --libs) |
103 |
-+SDL_CFLAGS = $(shell sdl-config --cflags) $(CFLAGS) |
104 |
-+ |
105 |
-+MAKEFILE = Makefile |
106 |
-+ |
107 |
-+OBJS = Button.o Font.o Game.o Main.o Sound.o Timer.o |
108 |
-+PRINT = pr |
109 |
-+ |
110 |
-+PROGRAM = ../LaserReaction/laserreaction |
111 |
-+ |
112 |
-+SHELL = /bin/sh |
113 |
-+ |
114 |
-+%.o: %.cpp |
115 |
-+ $(CPP) $(INCLUDES) $(CFLAGS) -c $< |
116 |
-+all: $(PROGRAM) |
117 |
-+ |
118 |
-+$(PROGRAM): $(OBJS) $(LIBS) |
119 |
-+ @echo "Linking $(PROGRAM) ..." |
120 |
-+ $(LD) -o $(PROGRAM) $(OBJS) $(LDFLAGS) $(SDL_LDFLAGS) |
121 |
-+ |
122 |
|
123 |
diff --git a/games-puzzle/laserreaction/files/laserreaction-1.0-misc.patch b/games-puzzle/laserreaction/files/laserreaction-1.0-misc.patch |
124 |
deleted file mode 100644 |
125 |
index 5ceda8b..0000000 |
126 |
--- a/games-puzzle/laserreaction/files/laserreaction-1.0-misc.patch |
127 |
+++ /dev/null |
128 |
@@ -1,53 +0,0 @@ |
129 |
-diff -Naur Game.cpp Game.cpp |
130 |
---- Game.cpp 2009-10-02 12:17:55.000000000 +0200 |
131 |
-+++ Game.cpp 2009-10-02 12:33:33.000000000 +0200 |
132 |
-@@ -58,7 +58,7 @@ |
133 |
- LoadStage(); |
134 |
- |
135 |
- printf("Loading music\n"); |
136 |
-- InitializeSoundSystem(); |
137 |
-+ InitFmod(); |
138 |
- if(!music.Load("Data/LD10.mp3",true)) |
139 |
- { |
140 |
- printf("Failed to load LD10.mp3\n"); |
141 |
-@@ -115,6 +115,12 @@ |
142 |
- return true; |
143 |
- } |
144 |
- |
145 |
-+void Game::InitFmod() |
146 |
-+{ |
147 |
-+ FSOUND_Init(44100, 32, 0); |
148 |
-+} |
149 |
-+ |
150 |
-+ |
151 |
- /*===========================================================*/ |
152 |
- /*= Pump =*/ |
153 |
- /*===========================================================*/ |
154 |
-diff -Naur Game.h Game.h |
155 |
---- Game.h 2009-10-02 12:26:36.000000000 +0200 |
156 |
-+++ Game.h 2009-10-02 12:31:26.000000000 +0200 |
157 |
-@@ -1,3 +1,4 @@ |
158 |
-+#define ILUT_USE_OPENGL |
159 |
- #pragma once |
160 |
- #include <SDL/SDL.h> |
161 |
- #ifdef WIN32 |
162 |
-@@ -68,6 +69,7 @@ |
163 |
- |
164 |
- unsigned int LoadImage(char* name, unsigned int& w, unsigned int& h); |
165 |
- void SetOrtho(int w, int h); |
166 |
-+ void InitFmod(); |
167 |
- void BindTexture(unsigned int id); |
168 |
- void RenderGame(const float interp); |
169 |
- void RenderTile(TileMap t, int frame, int x, int y, int w, int h); |
170 |
-diff -Naur Main.cpp Main.cpp |
171 |
---- Main.cpp 2009-10-02 12:26:47.000000000 +0200 |
172 |
-+++ Main.cpp 2009-10-02 12:31:46.000000000 +0200 |
173 |
-@@ -4,7 +4,7 @@ |
174 |
- /*=================================*/ |
175 |
- /*= Main Entry =*/ |
176 |
- /*=================================*/ |
177 |
--int _tmain(int argc, _TCHAR* argv[]) |
178 |
-+int main(int argc, char* argv[]) |
179 |
- { |
180 |
- Game* pGame = new Game(true); |
181 |
- //delete pGame; |
182 |
|
183 |
diff --git a/games-puzzle/laserreaction/files/laserreaction-1.0-sound.patch b/games-puzzle/laserreaction/files/laserreaction-1.0-sound.patch |
184 |
deleted file mode 100644 |
185 |
index 9163261..0000000 |
186 |
--- a/games-puzzle/laserreaction/files/laserreaction-1.0-sound.patch |
187 |
+++ /dev/null |
188 |
@@ -1,498 +0,0 @@ |
189 |
-diff -Naur Sound.cpp Sound.cpp |
190 |
---- Sound.cpp 2009-10-02 12:17:55.000000000 +0200 |
191 |
-+++ Sound.cpp 2009-10-02 12:23:34.000000000 +0200 |
192 |
-@@ -1,375 +1,109 @@ |
193 |
- #include "Sound.h" |
194 |
--#if SOUND_SYSTEM == USE_FMODEX |
195 |
--FMOD_RESULT result; |
196 |
--FMOD::System *pSystem; |
197 |
--#endif |
198 |
--void InitializeSoundSystem() |
199 |
--{ |
200 |
--//#if SOUND_SYSTEM == USE_BASS |
201 |
--//#else |
202 |
--//#endif |
203 |
--#if SOUND_SYSTEM == USE_FMODEX |
204 |
-- result = FMOD::System_Create(&pSystem); // Create the main system object. |
205 |
-- if (result != FMOD_OK) |
206 |
-- { |
207 |
-- return; |
208 |
-- } |
209 |
-- |
210 |
-- result = pSystem->init(100, FMOD_INIT_NORMAL, 0); // Initialize FMOD. |
211 |
-- if (result != FMOD_OK) |
212 |
-- { |
213 |
-- return; |
214 |
-- } |
215 |
--#elif SOUND_SYSTEM == USE_BASS |
216 |
-- if (BASS_Init(-1,44100,BASS_DEVICE_SPEAKERS,0,NULL)==FALSE) |
217 |
-- { |
218 |
-- return; |
219 |
-- } |
220 |
--#else |
221 |
-- FSOUND_Init(44100, 96, 0); |
222 |
--#endif |
223 |
--} |
224 |
--void ShutDownSoundSystem() |
225 |
--{ |
226 |
--#if SOUND_SYSTEM == USE_FMODEX |
227 |
-- pSystem->close(); |
228 |
--#elif SOUND_SYSTEM == USE_BASS |
229 |
-- BASS_Free(); |
230 |
--#else |
231 |
-- FSOUND_Close(); |
232 |
--#endif |
233 |
--} |
234 |
--void UpdateSoundSystem() |
235 |
--{ |
236 |
--#if SOUND_SYSTEM == USE_FMODEX |
237 |
-- pSystem->update(); |
238 |
--#endif |
239 |
--} |
240 |
--void SoundSystemPause(bool paused) |
241 |
--{ |
242 |
--#if SOUND_SYSTEM == USE_BASS |
243 |
-- paused? |
244 |
-- BASS_Pause(): BASS_Start(); |
245 |
--#endif |
246 |
--} |
247 |
- |
248 |
--void SetGlobalVolume(int music, int sfx) |
249 |
-+void Sound::Volume(int channel,int vol) |
250 |
- { |
251 |
--#if SOUND_SYSTEM == USE_BASS |
252 |
-- BASS_SetConfig(BASS_CONFIG_GVOL_SAMPLE,sfx); |
253 |
-- BASS_SetConfig(BASS_CONFIG_GVOL_MUSIC,music); |
254 |
--#endif |
255 |
--} |
256 |
--void StopAllSound() |
257 |
--{ |
258 |
--#if SOUND_SYSTEM == USE_BASS |
259 |
-- BASS_Stop(); |
260 |
-- SoundSystemPause(false); |
261 |
--#endif |
262 |
-+ FSOUND_SetVolume(channel,vol); |
263 |
- } |
264 |
-- |
265 |
-- |
266 |
-- |
267 |
- bool Sample::Load(char* sound, bool loop) |
268 |
- { |
269 |
--#if SOUND_SYSTEM == USE_FMODEX |
270 |
-- if(loop) |
271 |
-- pSystem->createSound(sound,FMOD_2D | FMOD_LOOP_NORMAL,NULL,&pSample); |
272 |
-- else |
273 |
-- pSystem->createSound(sound,FMOD_2D,NULL,&pSample); |
274 |
-- if(pSample == 0) |
275 |
-- { |
276 |
-- return false; |
277 |
-- } |
278 |
--#elif SOUND_SYSTEM == USE_BASS |
279 |
-- if(loop) |
280 |
-- pSample = BASS_SampleLoad(FALSE,sound,0,0,1,BASS_SAMPLE_LOOP); |
281 |
-- else |
282 |
-- pSample = BASS_SampleLoad(FALSE,sound,0,0,1,0); |
283 |
-- if(pSample == 0) |
284 |
-- { |
285 |
-- return false; |
286 |
-- } |
287 |
--#else |
288 |
- if(loop) |
289 |
- { |
290 |
- if((pSample = FSOUND_Sample_Load(FSOUND_FREE,sound,FSOUND_NORMAL | FSOUND_LOOP_NORMAL,0,0))==0) |
291 |
- { |
292 |
-- return false; |
293 |
-+ printf("Failed to load sample: %s\n",sound); |
294 |
-+ return false; |
295 |
- } |
296 |
- } |
297 |
- else |
298 |
- { |
299 |
- if((pSample = FSOUND_Sample_Load(FSOUND_FREE,sound,FSOUND_NORMAL | FSOUND_LOOP_OFF,0,0))==0) |
300 |
- { |
301 |
-+ printf("Failed to load sample: %s\n",sound); |
302 |
- return false; |
303 |
- } |
304 |
- } |
305 |
--#endif |
306 |
- return true; |
307 |
- } |
308 |
- int Sample::Play() |
309 |
- { |
310 |
- if(pSample) |
311 |
--#if SOUND_SYSTEM == USE_FMODEX |
312 |
-- { |
313 |
-- FMOD::Channel* c; |
314 |
-- pSystem->playSound(FMOD_CHANNEL_FREE,pSample,false,&c); |
315 |
-- c->getIndex(&miChannelID); |
316 |
-- return miChannelID; |
317 |
-- } |
318 |
--#elif SOUND_SYSTEM == USE_BASS |
319 |
-- { |
320 |
-- BASS_ChannelPlay(BASS_SampleGetChannel(pSample,FALSE),TRUE); |
321 |
-- } |
322 |
--#else |
323 |
- return(FSOUND_PlaySound(FSOUND_FREE,pSample)); |
324 |
--#endif |
325 |
- return -1; |
326 |
- } |
327 |
- void Sample::Play(int channel) |
328 |
- { |
329 |
- if(pSample) |
330 |
--#if SOUND_SYSTEM == USE_FMODEX |
331 |
-- { |
332 |
--// FMOD::Channel* c; |
333 |
--// pSystem->getChannel(channel,&c); |
334 |
-- pSystem->playSound((FMOD_CHANNELINDEX)(channel),pSample,false,NULL); |
335 |
-- miChannelID = channel; |
336 |
-- } |
337 |
--#elif SOUND_SYSTEM == USE_BASS |
338 |
-- { |
339 |
-- Stop(0); |
340 |
-- BASS_ChannelPlay(BASS_SampleGetChannel(pSample,FALSE),FALSE); |
341 |
-- } |
342 |
--#else |
343 |
- FSOUND_PlaySound(channel,pSample); |
344 |
--#endif |
345 |
- } |
346 |
- void Sample::Stop(int channel) |
347 |
- { |
348 |
--#if SOUND_SYSTEM == USE_FMODEX |
349 |
-- FMOD::Channel* c; |
350 |
-- pSystem->getChannel(miChannelID,&c); |
351 |
-- c->stop(); |
352 |
--#elif SOUND_SYSTEM == USE_BASS |
353 |
-- BASS_SampleStop(pSample); |
354 |
--#else |
355 |
- FSOUND_StopSound(channel); |
356 |
--#endif |
357 |
- } |
358 |
- void Sample::Discard() |
359 |
- { |
360 |
- if(pSample) |
361 |
--#if SOUND_SYSTEM == USE_FMODEX |
362 |
-- pSample->release(); |
363 |
--#elif SOUND_SYSTEM == USE_BASS |
364 |
-- BASS_SampleFree(pSample); |
365 |
--#else |
366 |
- FSOUND_Sample_Free(pSample); |
367 |
--#endif |
368 |
- // pSample = 0; |
369 |
- } |
370 |
- void Sample::SetFrequency(int channel,int frequency) |
371 |
- { |
372 |
--#if SOUND_SYSTEM == USE_FMODEX |
373 |
- FSOUND_SetFrequency(channel,frequency); |
374 |
--#endif |
375 |
- } |
376 |
- void Sample::SetDefaults(int deffreq, int defvol, int defpan, int defpri, int varfreq, int varvol, int varpan) |
377 |
- { |
378 |
--#if SOUND_SYSTEM == USE_FMODEX |
379 |
- FSOUND_Sample_SetDefaultsEx(pSample,deffreq,defvol,defpan,defpri,varfreq,varvol,varpan); |
380 |
--#endif |
381 |
- } |
382 |
--void Sample::Volume(int channel,int vol) |
383 |
--{ |
384 |
--#if SOUND_SYSTEM == USE_FMODEX |
385 |
-- FSOUND_SetVolume(channel,vol); |
386 |
--#elif SOUND_SYSTEM == USE_BASS |
387 |
-- BASS_ChannelSetAttributes(pSample,-1,vol,-101); |
388 |
--#endif |
389 |
--} |
390 |
--//================================================================================================// |
391 |
-- /*********************** |
392 |
-- ** streams ** |
393 |
-- ************************/ |
394 |
--//================================================================================================// |
395 |
- bool Stream::Load(char* stream, bool loop) |
396 |
- { |
397 |
-- if((pStream = BASS_StreamCreateFile(FALSE,stream, 0, 0, loop? BASS_SAMPLE_LOOP:0))==0) |
398 |
-- { |
399 |
-- return false; |
400 |
-- } |
401 |
-- return true; |
402 |
--} |
403 |
--int Stream::Play() |
404 |
--{ |
405 |
-- BASS_ChannelPlay(pStream,true); |
406 |
-- return 0; |
407 |
--} |
408 |
--void Stream::Play(int channel) |
409 |
--{ |
410 |
-- if(pStream) |
411 |
-- { |
412 |
-- if(BASS_ChannelPlay(pStream,false)==FALSE) |
413 |
-- printf("Failed to play\n"); |
414 |
-- |
415 |
-- } |
416 |
--} |
417 |
--void Stream::Stop(int channel) |
418 |
--{ |
419 |
-- BASS_ChannelStop(pStream); |
420 |
--} |
421 |
--void Stream::Discard() |
422 |
--{ |
423 |
-- BASS_StreamFree(pStream); |
424 |
--} |
425 |
--void Stream::Volume(int channel,int vol) |
426 |
--{ |
427 |
-- BASS_ChannelSetAttributes(pStream,-1,vol,-101); |
428 |
--} |
429 |
--//================================================================================================// |
430 |
-- /*********************** |
431 |
-- ** modules ** |
432 |
-- ************************/ |
433 |
--//================================================================================================// |
434 |
--bool Track::Load(char* stream, bool loop) |
435 |
--{ |
436 |
--#if SOUND_SYSTEM == USE_FMODEX |
437 |
-- if(loop) |
438 |
-- pSystem->createSound(stream,FMOD_2D | FMOD_LOOP_NORMAL,NULL,&pStream); |
439 |
-- else |
440 |
-- pSystem->createSound(stream,FMOD_2D | FMOD_ACCURATETIME,NULL,&pStream); |
441 |
-- if(pStream == 0) |
442 |
-- { |
443 |
-- return false; |
444 |
-- } |
445 |
--#elif SOUND_SYSTEM == USE_BASS |
446 |
- if(loop) |
447 |
-- pStream = BASS_MusicLoad(FALSE,stream,0,0,BASS_SAMPLE_LOOP,0); |
448 |
-- else |
449 |
-- pStream = BASS_MusicLoad(FALSE,stream,0,0,0,0); |
450 |
-- if(pStream == 0) |
451 |
- { |
452 |
-- return false; |
453 |
-- } |
454 |
--#else |
455 |
-- if(loop) |
456 |
-- { |
457 |
-- if((pStream = FMUSIC_LoadSong(stream))==0) |
458 |
-+ if((pStream = FSOUND_Stream_Open(stream,FSOUND_NORMAL | FSOUND_LOOP_NORMAL,0,0))==0) |
459 |
- { |
460 |
-+ printf("Failed to load sample: %s\n",stream); |
461 |
- return false; |
462 |
- } |
463 |
-- FMUSIC_SetLooping(pStream,true); |
464 |
- } |
465 |
- else |
466 |
- { |
467 |
-- if((pStream = FMUSIC_LoadSong(stream))==0) |
468 |
-+ if((pStream = FSOUND_Stream_Open(stream,FSOUND_NORMAL,0,0))==0) |
469 |
- { |
470 |
-+ printf("Failed to load sample: %s\n",stream); |
471 |
- return false; |
472 |
- } |
473 |
-- FMUSIC_SetLooping(pStream,false); |
474 |
- } |
475 |
--#endif |
476 |
- return true; |
477 |
- } |
478 |
--int Track::Play() |
479 |
-+int Stream::Play() |
480 |
- { |
481 |
- if(pStream) |
482 |
-- { |
483 |
--#if SOUND_SYSTEM == USE_FMODEX |
484 |
-- FMOD::Channel* c; |
485 |
-- pSystem->playSound(FMOD_CHANNEL_FREE,pStream,false,&c); |
486 |
-- c->getIndex(&miChannelID); |
487 |
--#elif SOUND_SYSTEM == USE_BASS |
488 |
-- BASS_ChannelPlay(pStream,true); |
489 |
--#else |
490 |
-- miChannelID = FMUSIC_PlaySong(pStream); |
491 |
--#endif |
492 |
-- return miChannelID; |
493 |
-- } |
494 |
-+ return(FSOUND_Stream_Play(FSOUND_FREE,pStream)); |
495 |
- return -1; |
496 |
- } |
497 |
--void Track::Play(int channel) |
498 |
-+void Stream::Play(int channel) |
499 |
- { |
500 |
- if(pStream) |
501 |
-- { |
502 |
--#if SOUND_SYSTEM == USE_FMODEX |
503 |
-- // FMOD::Channel* c; |
504 |
-- // pSystem->getChannel(channel,&c); |
505 |
-- pSystem->playSound((FMOD_CHANNELINDEX)(channel),pStream,false,NULL); |
506 |
--// pSystem->playSound(FMOD_CHANNEL_REUSE,pStream,false,&c); |
507 |
-- miChannelID = channel; |
508 |
--#elif SOUND_SYSTEM == USE_BASS |
509 |
-- BASS_ChannelPlay(pStream,true); |
510 |
--#else |
511 |
-- miChannelID = FMUSIC_PlaySong(pStream); |
512 |
--#endif |
513 |
-- } |
514 |
-+ FSOUND_Stream_Play(channel,pStream); |
515 |
-+// return(FSOUND_Stream_Play(channel,pStream)); |
516 |
-+// return -1; |
517 |
- } |
518 |
--void Track::Stop(int i) |
519 |
-+void Stream::Stop(int channel) |
520 |
- { |
521 |
- if(pStream) |
522 |
--#if SOUND_SYSTEM == USE_FMODEX |
523 |
-- { |
524 |
-- FMOD::Channel* c; |
525 |
-- pSystem->getChannel(miChannelID,&c); |
526 |
-- c->stop(); |
527 |
-- } |
528 |
--#elif SOUND_SYSTEM == USE_BASS |
529 |
-- BASS_ChannelStop(pStream); |
530 |
--#else |
531 |
-- FMUSIC_StopSong(pStream); |
532 |
--#endif |
533 |
-+ FSOUND_Stream_Stop(pStream); |
534 |
- } |
535 |
--void Track::Discard() |
536 |
-+void Stream::Discard() |
537 |
- { |
538 |
- if(pStream) |
539 |
--#if SOUND_SYSTEM == USE_FMODEX |
540 |
-- pStream->release(); |
541 |
--#elif SOUND_SYSTEM == USE_BASS |
542 |
-- BASS_MusicFree(pStream); |
543 |
--#else |
544 |
-- FMUSIC_FreeSong(pStream); |
545 |
--#endif |
546 |
-+ FSOUND_Stream_Close(pStream); |
547 |
- pStream = 0; |
548 |
- } |
549 |
--bool Track::IsFinished() |
550 |
--{ |
551 |
-- if(pStream) |
552 |
-- { |
553 |
--#if SOUND_SYSTEM == USE_FMODEX |
554 |
-- FMOD::Channel* c; |
555 |
-- pSystem->getChannel(miChannelID,&c); |
556 |
-- bool playing; |
557 |
-- c->isPlaying(&playing); |
558 |
-- if(!playing) |
559 |
--#elif SOUND_SYSTEM == USE_BASS |
560 |
-- if(BASS_ChannelIsActive(pStream) == BASS_ACTIVE_STOPPED) |
561 |
--#else |
562 |
-- if(FMUSIC_IsFinished(pStream)) |
563 |
--#endif |
564 |
-- return true; |
565 |
-- } |
566 |
-- return false; |
567 |
--} |
568 |
--bool Track::IsPlaying() |
569 |
-+void Stream::Seek(int ms, int channel) |
570 |
- { |
571 |
- if(pStream) |
572 |
- { |
573 |
--#if SOUND_SYSTEM == USE_FMODEX |
574 |
-- FMOD::Channel* c; |
575 |
-- pSystem->getChannel(miChannelID,&c); |
576 |
-- bool playing; |
577 |
-- c->isPlaying(&playing); |
578 |
-- if(playing) |
579 |
--#elif SOUND_SYSTEM == USE_BASS |
580 |
-- if(BASS_ChannelIsActive(pStream) == BASS_ACTIVE_PLAYING) |
581 |
--#else |
582 |
-- if(FMUSIC_IsPlaying(pStream)) |
583 |
--#endif |
584 |
-- return true; |
585 |
-+ FSOUND_Stream_Play(channel,pStream); |
586 |
-+ FSOUND_SetPaused(channel,true); |
587 |
-+ FSOUND_Stream_SetTime(pStream,ms); |
588 |
-+ FSOUND_SetPaused(channel,false); |
589 |
- } |
590 |
-- return false; |
591 |
- } |
592 |
-\ Kein Zeilenumbruch am Dateiende. |
593 |
-diff -Naur Sound.h Sound.h |
594 |
---- Sound.h 2009-10-02 12:17:55.000000000 +0200 |
595 |
-+++ Sound.h 2009-10-02 12:23:34.000000000 +0200 |
596 |
-@@ -1,25 +1,7 @@ |
597 |
- #pragma once |
598 |
--//#define USE_FMODEX |
599 |
--#define USE_FMODEX 0 |
600 |
--#define USE_FMOD 2 |
601 |
--#define USE_BASS 1 |
602 |
-- |
603 |
--#define SOUND_SYSTEM USE_BASS |
604 |
--#if SOUND_SYSTEM == USE_FMODEX |
605 |
--#include <FMODEX/fmod.hpp> |
606 |
--#elif SOUND_SYSTEM == USE_BASS |
607 |
--#include <bass.h> |
608 |
--#else |
609 |
--#include <FMOD/fmod.h> |
610 |
--#endif |
611 |
-+#include <fmod.h> |
612 |
- #include <stdio.h> |
613 |
- |
614 |
--void InitializeSoundSystem(); |
615 |
--void ShutDownSoundSystem(); |
616 |
--void UpdateSoundSystem(); |
617 |
--void SetGlobalVolume(int music, int sfx); |
618 |
--void SoundSystemPause(bool paused); |
619 |
--void StopAllSound(); |
620 |
- class Sound |
621 |
- { |
622 |
- public: |
623 |
-@@ -27,9 +9,7 @@ |
624 |
- virtual int Play()=0;//returns channel |
625 |
- virtual void Stop(int channel)=0; |
626 |
- virtual void Discard()=0; |
627 |
-- virtual void Volume(int channel,int vol)=0; |
628 |
-- |
629 |
-- int miChannelID; |
630 |
-+ void Volume(int channel,int vol); |
631 |
- }; |
632 |
- |
633 |
- |
634 |
-@@ -45,49 +25,20 @@ |
635 |
- void Discard(); |
636 |
- void SetFrequency(int channel,int frequency); |
637 |
- void SetDefaults(int deffreq, int defvol, int defpan, int defpri, int varfreq, int varvol, int varpan); |
638 |
-- void Volume(int channel,int vol); |
639 |
- private: |
640 |
--#if SOUND_SYSTEM == USE_FMODEX |
641 |
-- FMOD::Sound * pSample; |
642 |
--#elif SOUND_SYSTEM == USE_BASS |
643 |
-- HSAMPLE pSample; |
644 |
--#else |
645 |
- FSOUND_SAMPLE* pSample; |
646 |
--#endif |
647 |
- }; |
648 |
-- |
649 |
- class Stream : public Sound |
650 |
- { |
651 |
- public: |
652 |
- Stream(){pStream = 0;} |
653 |
-+// ~Stream(){ Discard(); } |
654 |
- bool Load(char* sound, bool loop); |
655 |
- int Play(); |
656 |
- void Play(int channel); |
657 |
- void Stop(int channel); |
658 |
- void Discard(); |
659 |
-- void Volume(int channel,int vol); |
660 |
--private: |
661 |
-- HSTREAM pStream; |
662 |
--}; |
663 |
-- |
664 |
--class Track : public Sound |
665 |
--{ |
666 |
--public: |
667 |
-- Track(){pStream = 0;} |
668 |
-- bool Load(char* sound, bool loop); |
669 |
-- int Play(); |
670 |
-- void Play(int channel); |
671 |
-- void Stop(int i); |
672 |
-- void Discard(); |
673 |
-- bool IsFinished(); |
674 |
-- bool IsPlaying(); |
675 |
-- void Volume(int channel,int vol); |
676 |
-+ void Seek(int ms, int channel); |
677 |
- private: |
678 |
--#if SOUND_SYSTEM == USE_FMODEX |
679 |
-- FMOD::Sound* pStream; |
680 |
--#elif SOUND_SYSTEM == USE_BASS |
681 |
-- HMUSIC pStream; |
682 |
--#else |
683 |
-- FMUSIC_MODULE* pStream; |
684 |
--#endif |
685 |
-+ FSOUND_STREAM* pStream; |
686 |
- }; |
687 |
|
688 |
diff --git a/games-puzzle/laserreaction/laserreaction-1.0.ebuild b/games-puzzle/laserreaction/laserreaction-1.0.ebuild |
689 |
deleted file mode 100644 |
690 |
index e501081..0000000 |
691 |
--- a/games-puzzle/laserreaction/laserreaction-1.0.ebuild |
692 |
+++ /dev/null |
693 |
@@ -1,49 +0,0 @@ |
694 |
-# Copyright 1999-2009 Gentoo Foundation |
695 |
-# Distributed under the terms of the GNU General Public License v2 |
696 |
-# $Header: $ |
697 |
- |
698 |
-EAPI=2 |
699 |
-inherit eutils games |
700 |
- |
701 |
-DESCRIPTION="laser game entry for ludum dare 10" |
702 |
-HOMEPAGE="http://xout.blackened-interactive.com/OldGames.html" |
703 |
-SRC_URI="http://xout.blackened-interactive.com/dump/new/LD10.zip" |
704 |
- |
705 |
-LICENSE="public-domain" |
706 |
-SLOT="0" |
707 |
-KEYWORDS="~x86" |
708 |
-IUSE="" |
709 |
- |
710 |
-RDEPEND="virtual/opengl |
711 |
- virtual/glu |
712 |
- media-libs/libsdl |
713 |
- media-libs/devil |
714 |
- =media-libs/fmod-3*" |
715 |
-DEPEND="${RDEPEND}" |
716 |
- |
717 |
-S=${WORKDIR}/LD10/Src |
718 |
- |
719 |
-src_prepare(){ |
720 |
- edos2unix *.{cpp,h} |
721 |
- epatch ${FILESDIR}/"${P}-makefile.patch" |
722 |
- epatch ${FILESDIR}/"${P}-includes.patch" |
723 |
- epatch ${FILESDIR}/"${P}-misc.patch" |
724 |
- epatch ${FILESDIR}/"${P}-sound.patch" |
725 |
- sed -i -e "s:Data/:"${GAMES_DATADIR}"/"${PN}"/:g" -i Game.cpp |
726 |
- |
727 |
-} |
728 |
- |
729 |
-src_install() { |
730 |
- dogamesbin ../LaserReaction/${PN} || die "dogamesbin ${PN} failed" |
731 |
- |
732 |
- local datadir="${GAMES_DATADIR}"/"${PN}" |
733 |
- dodir ${datadir} |
734 |
- insinto "${datadir}" |
735 |
- doins -r ../LaserReaction/Data/* || die "doins resources failed" |
736 |
- make_desktop_entry "${PN}" "${PN}" |
737 |
- prepgamesdirs |
738 |
-} |
739 |
- |
740 |
-pkg_postinst() { |
741 |
- games_pkg_postinst |
742 |
-} |
743 |
|
744 |
diff --git a/games-puzzle/laserreaction/metadata.xml b/games-puzzle/laserreaction/metadata.xml |
745 |
deleted file mode 100644 |
746 |
index 5d0ede2..0000000 |
747 |
--- a/games-puzzle/laserreaction/metadata.xml |
748 |
+++ /dev/null |
749 |
@@ -1,8 +0,0 @@ |
750 |
-<?xml version="1.0" encoding="UTF-8"?> |
751 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
752 |
-<pkgmetadata> |
753 |
-<maintainer> |
754 |
- <email>frostworks@×××.de</email> |
755 |
- <name>Marcel Unbehaun</name> |
756 |
-</maintainer> |
757 |
-</pkgmetadata> |