[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.193 by root, Tue Jul 31 00:30:16 2007 UTC vs.
Revision 1.202 by root, Sat Aug 4 03:29:03 2007 UTC

…		…
144	our $SETUP_KEYBOARD;	144	our $SETUP_KEYBOARD;
145		145
146	our $PL_NOTEBOOK;	146	our $PL_NOTEBOOK;
147	our $PL_WINDOW;	147	our $PL_WINDOW;
148		148
		149	our $MUSIC_PLAYING_WIDGET;
		150	our $LICENSE_WIDGET;
		151
149	our $INVENTORY_PAGE;	152	our $INVENTORY_PAGE;
150	our $STATS_PAGE;	153	our $STATS_PAGE;
151	our $SKILL_PAGE;	154	our $SKILL_PAGE;
152	our $SPELL_PAGE;	155	our $SPELL_PAGE;
153	our $SPELL_LIST;	156	our $SPELL_LIST;
…		…
159	our $STATWIDS;	162	our $STATWIDS;
160		163
161	our $SDL_ACTIVE;	164	our $SDL_ACTIVE;
162	our %SDL_CB;	165	our %SDL_CB;
163		166
		167	our $ALT_ENTER_MESSAGE;
		168	our $STATUSBOX;
		169	our $DEBUG_STATUS;
		170
		171	our $INV;
		172	our $INVR;
		173	our $INV_RIGHT_HB;
		174
		175	our $PICKUP_CFG;
		176
		177	#############################################################################
		178
		179	sub status {
		180	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
		181	}
		182
		183	sub debug {
		184	$DEBUG_STATUS->set_text ($_[0]);
		185	}
		186
		187	sub message {
		188	my ($para) = @_;
		189	$MESSAGE_WINDOW->message ($para);
		190	}
		191
		192	#############################################################################
		193	#TODO: maybe move into own audio module...
		194
164	our $SDL_MIXER;	195	our $SDL_MIXER;
		196
165	our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";	197	our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166	our @MUSIC_WANT;	198	our $MUSIC_WANT; # arryref of ambient music we want to play
		199	our @MUSIC_HAVE; # ambient music we have on disk
167	our $MUSIC_START;	200	our $MUSIC_START;
		201	our @MUSIC_JINGLE; # which jingles to play next
168	our $MUSIC_PLAYING_DATA;	202	our $MUSIC_PLAYING_DATA;
169	our $MUSIC_PLAYING_META;	203	our $MUSIC_PLAYING_META;
170	our $MUSIC_PLAYER;	204	our $MUSIC_PLAYER;
171	our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before	205	our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
172	our @SOUNDS; # event => file mapping	206
173	our %AUDIO_CHUNKS; # audio files	207	our %AUDIO_CHUNK; # audio "files"
		208	our %AUDIO_PLAY; # which audio faces should be played
174		209
175	our $ALT_ENTER_MESSAGE;	210	sub audio_channel_finished {
176	our $STATUSBOX;	211	my ($channel) = @_;
177	our $DEBUG_STATUS;
178		212
179	our $INV;	213	# warn "channel $channel finished\n";#d#
180	our $INVR;
181	our $INV_RIGHT_HB;
182
183	our $PICKUP_CFG;
184
185	sub status {
186	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
187	}	214	}
188		215
189	sub debug {	216	sub audio_sound_push($) {
190	$DEBUG_STATUS->set_text ($_[0]);
191	}
192
193	sub message {
194	my ($para) = @_;	217	my ($face) = @_;
195	$MESSAGE_WINDOW->message ($para);	218
		219	$CFG->{effects_enable}
		220	or return;
		221
		222	if (my $chunk = $AUDIO_CHUNK{$face}) {
		223	for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) \|\| []}) {
		224	my (undef, $dx, $dy, $vol) = @$_;
		225
		226	my $channel = CFPlus::Channel::find;
		227	$channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
		228	$dx = $dx / 10 * 255;
		229	$channel->set_panning (255 - $dx, 255 + $dx);
		230
		231	# my $angle = $dx ? : $dx < 0 ?
		232	# my $distance = -$vol;
		233	# $channel->set_position ($angle, $distance);
		234
		235	$chunk->play ($channel);
		236	}
		237	} else {
		238	# sound_meta not set means data is in flight either way
		239	my $meta = $CONN->{sound_meta}{$face}
		240	or return;
		241
		242	# if its a jingle, play it as ambient music
		243	if ($meta->{meta}{jingle}) {
		244	delete $AUDIO_PLAY{$face}; # take the jingle out of the sound queue
		245	push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
		246	&audio_music_push ($face);
		247	} else {
		248	# fetch from database
		249	CFPlus::DB::get res_data => $meta->{name}, sub {
		250	my $rwops = new CFPlus::RW $_[0];
		251	my $chunk = new CFPlus::MixChunk $rwops;
		252	$chunk->volume (($meta->{meta}{volume} \|\| 1) * 128);
		253	$AUDIO_CHUNK{$face} = $chunk;
		254
		255	audio_sound_push ($face);
		256	};
		257	}
		258	}
196	}	259	}
		260
		261	sub audio_sound_play {
		262	my ($face, $dx, $dy, $vol) = @_;
		263
		264	$SDL_MIXER
		265	or return;
		266	$CFG->{effects_enable}
		267	or return;
		268
		269	my $queue = $AUDIO_PLAY{$face} \|\|= [];
		270	push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
		271	audio_sound_push $face
		272	unless @$queue > 1;
		273	}
		274
		275	sub audio_music_set_meta {
		276	my ($meta) = @_;
		277
		278	$MUSIC_PLAYING_META = $meta;
		279	$MUSIC_PLAYING_WIDGET->set_markup (
		280	"<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
		281	. "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
		282	. "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
		283	. "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
		284	);
		285	}
		286
		287	sub audio_music_update_volume {
		288	return unless $MUSIC_PLAYING_META;
		289	my $volume = $MUSIC_PLAYING_META->{meta}{volume} \|\| 1;
		290	my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
		291	CFPlus::MixMusic::volume $base * $volume * 128;
		292	}
		293
		294	sub audio_music_start {
		295	my $meta = $MUSIC_PLAYING_META;
		296
		297	CFPlus::DB::get res_data => $meta->{name}, sub {
		298	return unless $SDL_MIXER;
		299
		300	# music might have changed...
		301	$meta eq $MUSIC_PLAYING_META
		302	or return &audio_music_start ();
		303
		304	audio_music_update_volume;
		305
		306	$MUSIC_PLAYING_DATA = \$_[0];
		307
		308	my $rwops = $meta->{path}
		309	? new_from_file CFPlus::RW $meta->{path}
		310	: new CFPlus::RW $$MUSIC_PLAYING_DATA;
		311
		312	$MUSIC_PLAYER = new CFPlus::MixMusic $rwops
		313	or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
		314
		315	my $NOW = time;
		316
		317	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
		318	my $pos = $MUSIC_PLAYING_META->{stop_pos};
		319	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
		320	$MUSIC_START = time - $pos;
		321	} else {
		322	$MUSIC_PLAYER->play (0);
		323	$MUSIC_START = time;
		324	}
		325
		326	delete $meta->{stop_time};
		327	delete $meta->{stop_pos};
		328	}
		329	}
		330
		331	sub audio_music_push {
		332	return unless $SDL_MIXER;
		333
		334	my $fade_out;
		335
		336	if (@MUSIC_JINGLE) {
		337	@MUSIC_HAVE = $MUSIC_JINGLE[0];
		338	$fade_out = 333;
		339	} else {
		340	return unless $CFG->{bgm_enable};
		341
		342	my @have =
		343	grep $_,
		344	map $CONN->{music_meta}{$_},
		345	@$MUSIC_WANT;
		346
		347	@MUSIC_HAVE = @have
		348	if @have;
		349
		350	# default MUSIC_HAVE == MUSIC_DEFAULT
		351	@MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
		352	$fade_out = 1000;
		353	}
		354
		355	# if the currently playing song is acceptable, let it continue
		356	return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
		357
		358	my $NOW = time;
		359
		360	if ($MUSIC_PLAYING_META) {
		361	$MUSIC_PLAYING_META->{stop_time} = $NOW;
		362	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
		363	CFPlus::MixMusic::fade_out $fade_out;
		364	} else {
		365	# sort by stop time, oldest first
		366	@MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
		367
		368	# if the most recently-played piece played very recently,
		369	# resume it, else choose the oldest piece for rotation.
		370	audio_music_set_meta
		371	$MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
		372	? $MUSIC_HAVE[-1]
		373	: $MUSIC_HAVE[0];
		374
		375	audio_music_start;
		376	}
		377	}
		378
		379	sub audio_music_set_ambient {
		380	my ($songs) = @_;
		381
		382	$MUSIC_WANT = $songs;
		383	audio_music_push;
		384	}
		385
		386	sub audio_music_finished {
		387	# we compress multiple jingles of the same type
		388	shift @MUSIC_JINGLE
		389	while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
		390
		391	$MUSIC_PLAYING_WIDGET->clear;
		392
		393	undef $MUSIC_PLAYER;
		394	undef $MUSIC_PLAYING_META;
		395	undef $MUSIC_PLAYING_DATA;
		396
		397	audio_music_push;
		398	}
		399
		400	sub audio_init {
		401	if ($CFG->{audio_enable}) {
		402	$ENV{MIX_EFFECTSMAXSPEED} = 1;
		403	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
		404
		405	unless ($SDL_MIXER) {
		406	status "Unable to open sound device: there will be no sound";
		407	return;
		408	}
		409
		410	CFPlus::Mix_AllocateChannels 16;
		411
		412	audio_music_finished;
		413	} else {
		414	undef $SDL_MIXER;
		415	}
		416	}
		417
		418	sub audio_shutdown {
		419	undef $MUSIC_PLAYER;
		420	undef $MUSIC_PLAYING_META;
		421	undef $MUSIC_PLAYING_DATA;
		422
		423	audio_music_set_meta { };
		424
		425	$MUSIC_WANT = [];
		426	@MUSIC_JINGLE = ();
		427	%AUDIO_PLAY = ();
		428	%AUDIO_CHUNK = ();
		429
		430	CFPlus::Mix_CloseAudio if $SDL_MIXER;
		431	undef $SDL_MIXER;
		432	}
		433
		434	#############################################################################
197		435
198	sub destroy_query_dialog {	436	sub destroy_query_dialog {
199	(delete $_[0]{query_dialog})->destroy	437	(delete $_[0]{query_dialog})->destroy
200	if $_[0]{query_dialog};	438	if $_[0]{query_dialog};
201	}	439	}
…		…
481	$SETUP_DIALOG->show;	719	$SETUP_DIALOG->show;
482	$PL_WINDOW->hide;	720	$PL_WINDOW->hide;
483	$SPELL_LIST->clear_spells;	721	$SPELL_LIST->clear_spells;
484	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);	722	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
485		723
486	&audio_music_set ([]);	724	&audio_music_set_ambient ([]);
487		725
488	return unless $CONN;	726	return unless $CONN;
489		727
490	status "connection closed";	728	status "connection closed";
491		729
…		…
624	}	862	}
625		863
626	sub audio_setup {	864	sub audio_setup {
627	my $vbox = new CFPlus::UI::VBox;	865	my $vbox = new CFPlus::UI::VBox;
628		866
629	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	867	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
630		868
631	my $row = 0;	869	my $row = 0;
632		870
633	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");	871	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
634	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	872	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
…		…
638	);	876	);
639	# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");	877	# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
640	# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	878	# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
641	# $CFG->{effects_volume} = $_[1];	879	# $CFG->{effects_volume} = $_[1];
642	# });	880	# });
		881
		882	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
		883	$table->add_at (1, $row, new CFPlus::UI::CheckBox
		884	expand => 1, state => $CFG->{effects_enable},
		885	tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
		886	on_changed => sub { $CFG->{effects_enable} = $_[1]; 0 }
		887	);
		888	$table->add_at (2, $row++, new CFPlus::UI::Slider
		889	expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
		890	tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
		891	. "is set highest and you use your operating system volume setting. Changes are instant.",
		892	on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
		893	);
		894
643	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");	895	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
644	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);	896	$table->add_at (1, $row, new CFPlus::UI::CheckBox
645	$hbox->add (new CFPlus::UI::CheckBox
646	expand => 1, state => $CFG->{bgm_enable},	897	expand => 1, state => $CFG->{bgm_enable},
647	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	898	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
648	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	899	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
649	);	900	);
650	$hbox->add (new CFPlus::UI::Slider	901	$table->add_at (2, $row++, new CFPlus::UI::Slider
651	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	902	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
652	tooltip => "The volume of the background music. Changes are instant.",	903	tooltip => "The volume of the background music. Changes are instant.",
653	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }	904	on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
654	);	905	);
655		906
656	$table->add_at (1, $row++, new CFPlus::UI::Button	907	$table->add_at (1, $row++, new CFPlus::UI::Button
657	expand => 1, align => 0, text => "Apply",	908	c_colspan => 2, expand => 1, align => 0, text => "Apply",
658	tooltip => "Apply the audio settings",	909	tooltip => "Apply the audio settings",
659	on_activate => sub {	910	on_activate => sub {
660	audio_shutdown ();	911	audio_shutdown ();
661	audio_init ();	912	audio_init ();
662	0	913	0
…		…
733	$table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );	984	$table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
734		985
735	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#	986	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
736		987
737	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);	988	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
738	$t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);	989	$t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
739	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);	990	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
740	$t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);	991	$t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
741	$t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);	992	$t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
742	$t->add_at (1,1, new CFPlus::UI::Label text => "e");	993	$t->add_at (1,1, new CFPlus::UI::Label text => "e");
743		994
744	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);	995	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
745		996
746	$c->add_items ({	997	$c->add_items ({
…		…
1353	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");	1604	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1354		1605
1355	$hb	1606	$hb
1356	}	1607	}
1357		1608
		1609	sub media_window {
		1610	my $vb = new CFPlus::UI::VBox;
		1611
		1612	$vb->add (new CFPlus::UI::FancyFrame
		1613	label => "Currently playing music",
		1614	child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
		1615	child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
		1616	);
		1617
		1618	$vb->add (new CFPlus::UI::FancyFrame
		1619	label => "Other media used in this session",
		1620	expand => 1,
		1621	child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
		1622	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
		1623	);
		1624
		1625	$vb
		1626	}
		1627
		1628	sub add_license {
		1629	my ($meta) = @_;
		1630
		1631	$meta = $meta->{meta}
		1632	or return;
		1633
		1634	$meta->{license} \|\| $meta->{author} \|\| $meta->{source}
		1635	or return;
		1636
		1637	$LICENSE_WIDGET->add_paragraph ({
		1638	fg => [1, 1, 1, 1],
		1639	markup => "<small>"
		1640	. "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
		1641	. "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
		1642	. "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
		1643	. "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
		1644	. "</small>",
		1645	});
		1646	$LICENSE_WIDGET->scroll_to_bottom;
		1647	}
		1648
1358	sub toggle_player_page {	1649	sub toggle_player_page {
1359	my ($widget) = @_;	1650	my ($widget) = @_;
1360		1651
1361	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {	1652	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1362	$PL_WINDOW->hide;	1653	$PL_WINDOW->hide;
…		…
1399	$ntb->add_tab (	1690	$ntb->add_tab (
1400	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,	1691	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1401	"Toggles the inventory window, where you can manage your loot (or treasures :). "	1692	"Toggles the inventory window, where you can manage your loot (or treasures :). "
1402	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."	1693	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1403	);	1694	);
1404	$ntb->add_tab (Pickup => autopickup_setup,	1695	$ntb->add_tab (Pickup => autopickup_setup,
1405	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1696	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
		1697
		1698	$ntb->add_tab (Media => media_window,
		1699	"License, Author and Source info for media sent by the server.");
1406		1700
1407	$ntb->set_current_page ($INVENTORY_PAGE);	1701	$ntb->set_current_page ($INVENTORY_PAGE);
1408		1702
1409	$plwin->add ($ntb);	1703	$plwin->add ($ntb);
1410	$plwin	1704	$plwin
…		…
1785		2079
1786	sub video_shutdown {	2080	sub video_shutdown {
1787	CFPlus::OpenGL::shutdown;	2081	CFPlus::OpenGL::shutdown;
1788		2082
1789	undef $SDL_ACTIVE;	2083	undef $SDL_ACTIVE;
1790	}
1791
1792	sub audio_channel_finished {
1793	my ($channel) = @_;
1794
1795	# warn "channel $channel finished\n";#d#
1796	}
1797
1798	our %AUDIO_PLAY;
1799	our %AUDIO_CHUNK;
1800
1801	sub audio_sound_push($) {
1802	my ($face) = @_;
1803
1804	if (my $chunk = $AUDIO_CHUNK{$face}) {
1805	for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) \|\| []}) {
1806	my (undef, $dx, $dy, $vol) = @$_;
1807
1808	my $channel = $chunk->play
1809	or return;
1810
1811	$channel->volume (128 + $vol);
1812	$dx = $dx / 10 * 255;
1813	$channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
1814	# my $angle = $dx ? : $dx < 0 ?
1815	# my $distance = -$vol;
1816	# $channel->set_position ($angle, $distance);
1817	}
1818	} else {
1819	# sound_meta not set means data is in flight either way
1820	my $meta = $CONN->{sound_meta}{$face}
1821	or return;
1822
1823	# fetch from database
1824	CFPlus::DB::get res_data => $meta->{name}, sub {
1825	my $vol = $meta->{meta}{volume} \|\| 1;
1826	my $rwops = new CFPlus::RW $_[0];
1827	my $chunk = new CFPlus::MixChunk $rwops;
1828	$chunk->volume ($vol * 128);
1829	$AUDIO_CHUNK{$face} = $chunk;
1830
1831	audio_sound_push ($face);
1832	};
1833	}
1834	}
1835
1836	sub audio_sound_play {
1837	my ($face, $dx, $dy, $vol) = @_;
1838
1839	$SDL_MIXER
1840	or return;
1841
1842	my $queue = $AUDIO_PLAY{$face} \|\|= [];
1843	push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
1844	audio_sound_push $face
1845	unless @$queue > 1;
1846	}
1847
1848	sub audio_music_set {
1849	my ($songs) = @_;
1850
1851	my @want =
1852	grep $_,
1853	map $CONN->{music_meta}{$_},
1854	@$songs;
1855
1856	if (@want) {
1857	@MUSIC_WANT = @want;
1858	&audio_music_changed ();
1859	}
1860	}
1861
1862	sub audio_music_start {
1863	my $meta = $MUSIC_PLAYING_META;
1864
1865	CFPlus::DB::get res_data => $meta->{name}, sub {
1866	return unless $SDL_MIXER;
1867
1868	# music might have changed...
1869	$meta eq $MUSIC_PLAYING_META
1870	or return &audio_music_start ();
1871
1872	$MUSIC_PLAYING_DATA = \$_[0];
1873
1874	my $rwops = $meta->{path}
1875	? new_from_file CFPlus::RW $meta->{path}
1876	: new CFPlus::RW $$MUSIC_PLAYING_DATA;
1877
1878	$MUSIC_PLAYER = new CFPlus::MixMusic $rwops
1879	or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
1880
1881	my $NOW = time;
1882
1883	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
1884	my $pos = $MUSIC_PLAYING_META->{stop_pos};
1885	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1886	$MUSIC_START = time - $pos;
1887	} else {
1888	$MUSIC_PLAYER->play (0);
1889	$MUSIC_START = time;
1890	}
1891
1892	delete $MUSIC_PLAYING_META->{stop_time};
1893	delete $MUSIC_PLAYING_META->{stop_pos};
1894	}
1895	}
1896
1897	sub audio_music_changed {
1898	return unless $CFG->{bgm_enable};
1899	return unless $SDL_MIXER;
1900
1901	# default MUSIC_WANT == MUSIC_DEFAULT
1902	@MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1903
1904	# if the currently playing song is acceptable, let it continue
1905	return if $MUSIC_PLAYING_META
1906	&& grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
1907
1908	my $NOW = time;
1909
1910	if ($MUSIC_PLAYING_META) {
1911	$MUSIC_PLAYING_META->{stop_time} = $NOW;
1912	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
1913	CFPlus::MixMusic::fade_out 1000;
1914	} else {
1915	# sort by stop time, oldest first
1916	@MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1917
1918	# if the most recently-played piece played very recently,
1919	# resume it, else choose the oldest piece for rotation.
1920	$MUSIC_PLAYING_META =
1921	$MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1922	? $MUSIC_WANT[-1]
1923	: $MUSIC_WANT[0];
1924
1925	audio_music_start;
1926	}
1927	}
1928
1929	sub audio_music_finished {
1930	undef $MUSIC_PLAYER;
1931	undef $MUSIC_PLAYING_META;
1932	undef $MUSIC_PLAYING_DATA;
1933
1934	audio_music_changed;
1935	}
1936
1937	sub audio_init {
1938	if ($CFG->{audio_enable}) {
1939	$ENV{MIX_EFFECTSMAXSPEED} = 1;
1940	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1941
1942	unless ($SDL_MIXER) {
1943	status "Unable to open sound device: there will be no sound";
1944	return;
1945	}
1946
1947	CFPlus::Mix_AllocateChannels 16;
1948	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1949
1950	audio_music_finished;
1951	} else {
1952	undef $SDL_MIXER;
1953	}
1954	}
1955
1956	sub audio_shutdown {
1957	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1958	undef $SDL_MIXER;
1959	@SOUNDS = ();
1960	%AUDIO_CHUNKS = ();
1961	}	2084	}
1962		2085
1963	my %animate_object;	2086	my %animate_object;
1964	my $animate_timer;	2087	my $animate_timer;
1965		2088
…		…
2069	gauge_fontsize => 1,	2192	gauge_fontsize => 1,
2070	gauge_size => 0.35,	2193	gauge_size => 0.35,
2071	stat_fontsize => 0.7,	2194	stat_fontsize => 0.7,
2072	mapsize => 100,	2195	mapsize => 100,
2073	audio_enable => 1,	2196	audio_enable => 1,
		2197	effects_enable => 1,
		2198	effects_volume => 1,
2074	bgm_enable => 1,	2199	bgm_enable => 1,
2075	bgm_volume => 0.25,	2200	bgm_volume => 0.5,
2076	output_sync => 1,	2201	output_sync => 1,
2077	output_count => 1,	2202	output_count => 1,
2078	output_rate => "",	2203	output_rate => "",
2079	pickup => 0,	2204	pickup => 0,
2080	inv_sort => "mtime",	2205	inv_sort => "mtime",

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.193 by root, Tue Jul 31 00:30:16 2007 UTC vs. Revision 1.202 by root, Sat Aug 4 03:29:03 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.193 by root, Tue Jul 31 00:30:16 2007 UTC vs.
Revision 1.202 by root, Sat Aug 4 03:29:03 2007 UTC