diff options
| author | callum_linden <none@none> | 2016-05-31 14:51:40 -0700 | 
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-31 14:51:40 -0700 | 
| commit | 69174fcc58e0a2e67a417c2e0060d9f36a0ba238 (patch) | |
| tree | 5637b093164d060e5c47b73ab58d328deb3f8fbd /indra/media_plugins/libvlc | |
| parent | dca6153c236dbd81f3f0c23b449136452f7d7ef9 (diff) | |
Fix windows line endings
Diffstat (limited to 'indra/media_plugins/libvlc')
| -rw-r--r-- | indra/media_plugins/libvlc/media_plugin_libvlc.cpp | 78 | 
1 files changed, 39 insertions, 39 deletions
| diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp index 43d4e95243..3852d10c44 100644 --- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp +++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp @@ -330,45 +330,45 @@ void MediaPluginLibVLC::receiveMessage( const char* message_string )  				playMedia();              }          } -		else 
 -		if (message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME)
 -		{
 -			if (message_name == "stop")
 -			{
 -				if (gLibVLCMediaPlayer)
 -				{
 -					libvlc_media_player_stop(gLibVLCMediaPlayer);
 -				}
 -			}
 -			else if (message_name == "start")
 -			{
 -				if (gLibVLCMediaPlayer)
 -				{
 -					libvlc_media_player_play(gLibVLCMediaPlayer);
 -				}
 -			}
 -			else if (message_name == "pause")
 -			{
 -				if (gLibVLCMediaPlayer)
 -				{
 -					libvlc_media_player_pause(gLibVLCMediaPlayer);
 -				}
 -			}
 -			else if (message_name == "seek")
 -			{
 -			}
 -			else if (message_name == "set_loop")
 -			{
 -			}
 -			else if (message_name == "set_volume")
 -			{
 -				if (gLibVLCMediaPlayer)
 -				{
 -					F64 volume = message_in.getValueReal("volume");
 -					libvlc_audio_set_volume(gLibVLCMediaPlayer, (int)(volume * 100));
 -				}
 -			}
 -		}
 +		else  +		if (message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME) +		{ +			if (message_name == "stop") +			{ +				if (gLibVLCMediaPlayer) +				{ +					libvlc_media_player_stop(gLibVLCMediaPlayer); +				} +			} +			else if (message_name == "start") +			{ +				if (gLibVLCMediaPlayer) +				{ +					libvlc_media_player_play(gLibVLCMediaPlayer); +				} +			} +			else if (message_name == "pause") +			{ +				if (gLibVLCMediaPlayer) +				{ +					libvlc_media_player_pause(gLibVLCMediaPlayer); +				} +			} +			else if (message_name == "seek") +			{ +			} +			else if (message_name == "set_loop") +			{ +			} +			else if (message_name == "set_volume") +			{ +				if (gLibVLCMediaPlayer) +				{ +					F64 volume = message_in.getValueReal("volume"); +					libvlc_audio_set_volume(gLibVLCMediaPlayer, (int)(volume * 100)); +				} +			} +		}      }  } | 
