Attachment #860504 for bug #778542

Lines 1-6 Link Here

(-)a/data/music/menu/Makefile.am (-2 / +1 lines)
1	pkgdatadir = $(datadir)/@PACKAGE@/music/menu	1	pkgdatadir = $(datadir)/@PACKAGE@/music/menu
2	pkgdata_DATA = esprit.ogg \	2	pkgdata_DATA = esprit.ogg \
3	enigma_rag.ogg \	3	enigma_rag.ogg
4	pentagonal_dreams.s3m
5		4
6	EXTRA_DIST = $(pkgdata_DATA)	5	EXTRA_DIST = $(pkgdata_DATA)




    // Menu Music
    music_singles["Esprit"] =
        MusicSingle("Esprit", "music/menu/esprit.ogg");
    music_singles["Pentagonal Dreams"] =
        MusicSingle("Pentagonal Dreams", "music/menu/pentagonal_dreams.s3m");
    
    // Level Music
    music_singles["Across The Ice"] =

    music_queues["Default"].appendSingle("Esprit", false);
    music_queues["Default"].appendSingleThenWait("Esprit", true, 8.0);
    music_queues["Default"].appendSingleThenWait("Enigma Rag", true, 8.0);
    music_queues["Default"].appendSingleThenWait("Pentagonal Dreams", true, 8.0);

    music_queues["Esprit"] = MusicQueue("Esprit", MUSICQUEUE_NEXT, 1);
    music_queues["Esprit"].appendSingle("Esprit", false);

    music_queues["Enigma Rag"] = MusicQueue("Enigma Rag", MUSICQUEUE_NEXT, 2);
    music_queues["Enigma Rag"].appendSingleThenWait("Enigma Rag", false, 8.0);

    music_queues["Pentagonal Dreams"] = MusicQueue("Pentagonal Dreams", MUSICQUEUE_NEXT, 3);
    music_queues["Pentagonal Dreams"].appendSingle("Pentagonal Dreams", true);

    active_music_queue_title = app.state->getString("MenuMusicQueue");
    // Set the default menu music queue, if saved queue doesn't exist.
    if(music_queues.find(active_music_queue_title) == music_queues.end())
- 

Return to bug 778542

Lines 218-225 void MusicManager::init() Link Here

(-)a/src/MusicManager.cc (-7 lines)
218	// Menu Music	218	// Menu Music
219	music_singles["Esprit"] =	219	music_singles["Esprit"] =
220	MusicSingle("Esprit", "music/menu/esprit.ogg");	220	MusicSingle("Esprit", "music/menu/esprit.ogg");
221	music_singles["Pentagonal Dreams"] =
222	MusicSingle("Pentagonal Dreams", "music/menu/pentagonal_dreams.s3m");
223		221
224	// Level Music	222	// Level Music
225	music_singles["Across The Ice"] =	223	music_singles["Across The Ice"] =
Lines 247-253 void MusicManager::init() Link Here
247	music_queues["Default"].appendSingle("Esprit", false);	245	music_queues["Default"].appendSingle("Esprit", false);
248	music_queues["Default"].appendSingleThenWait("Esprit", true, 8.0);	246	music_queues["Default"].appendSingleThenWait("Esprit", true, 8.0);
249	music_queues["Default"].appendSingleThenWait("Enigma Rag", true, 8.0);	247	music_queues["Default"].appendSingleThenWait("Enigma Rag", true, 8.0);
250	music_queues["Default"].appendSingleThenWait("Pentagonal Dreams", true, 8.0);
251		248
252	music_queues["Esprit"] = MusicQueue("Esprit", MUSICQUEUE_NEXT, 1);	249	music_queues["Esprit"] = MusicQueue("Esprit", MUSICQUEUE_NEXT, 1);
253	music_queues["Esprit"].appendSingle("Esprit", false);	250	music_queues["Esprit"].appendSingle("Esprit", false);
Lines 255-263 void MusicManager::init() Link Here
255	music_queues["Enigma Rag"] = MusicQueue("Enigma Rag", MUSICQUEUE_NEXT, 2);	252	music_queues["Enigma Rag"] = MusicQueue("Enigma Rag", MUSICQUEUE_NEXT, 2);
256	music_queues["Enigma Rag"].appendSingleThenWait("Enigma Rag", false, 8.0);	253	music_queues["Enigma Rag"].appendSingleThenWait("Enigma Rag", false, 8.0);
257		254
258	music_queues["Pentagonal Dreams"] = MusicQueue("Pentagonal Dreams", MUSICQUEUE_NEXT, 3);
259	music_queues["Pentagonal Dreams"].appendSingle("Pentagonal Dreams", true);
260
261	active_music_queue_title = app.state->getString("MenuMusicQueue");	255	active_music_queue_title = app.state->getString("MenuMusicQueue");
262	// Set the default menu music queue, if saved queue doesn't exist.	256	// Set the default menu music queue, if saved queue doesn't exist.
263	if(music_queues.find(active_music_queue_title) == music_queues.end())	257	if(music_queues.find(active_music_queue_title) == music_queues.end())
264	-