Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop

This commit is contained in:
Florian Küpper committed 2013-05-02 09:42:15 +02:00
commit 17366b5a36
4 files changed
+11 -3

No files matched your search

+2
View File
@@ -83,6 +83,7 @@ DllExport void Close(int Stream)
if(it != Streams.end()) if(it != Streams.end())
{ {
delete it->second; delete it->second;
IDs.push(it->first);
Streams.erase(it); Streams.erase(it);
} }
} }
@@ -236,6 +237,7 @@ DllExport void Update(void)
if(p->second->Closed) if(p->second->Closed)
{ {
delete p->second; delete p->second;
IDs.push(p->first);
Streams.erase(p++); Streams.erase(p++);
} }
else { else {
+7 -2
View File
@@ -92,11 +92,14 @@ int GstreamerAudioStream::Load(const wchar_t* Media, bool Prescan)
void GstreamerAudioStream::Close(void) void GstreamerAudioStream::Close(void)
{ {
if(Element) if(Element)
{
gst_element_set_state(Element, GST_STATE_NULL); gst_element_set_state(Element, GST_STATE_NULL);
gst_object_unref(GST_OBJECT (Element));
}
/* without that there are no crashes any more. but i don't know if there is a memory leak if we do that.
if(Bus) if(Bus)
gst_object_unref(Bus); gst_object_unref(Bus);
if(Element)
gst_object_unref(Element);
if(Message) if(Message)
gst_message_unref(Message); gst_message_unref(Message);
if(Convert) if(Convert)
@@ -109,6 +112,8 @@ void GstreamerAudioStream::Close(void)
gst_object_unref(GhostPad); gst_object_unref(GhostPad);
if(SinkBin) if(SinkBin)
gst_object_unref(SinkBin); gst_object_unref(SinkBin);
*/
if(FadeTimer) if(FadeTimer)
g_timer_destroy (FadeTimer); g_timer_destroy (FadeTimer);
+1 -1
View File
@@ -136,7 +136,7 @@ namespace Vocaluxe.Base
if (CConfig.BackgroundMusicSource != EBackgroundMusicSource.TR_CONFIG_ONLY_OWN_MUSIC) if (CConfig.BackgroundMusicSource != EBackgroundMusicSource.TR_CONFIG_ONLY_OWN_MUSIC)
AddBackgroundMusic(); AddBackgroundMusic();
if (CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON) if (CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON && CConfig.VideosToBackground == EOffOn.TR_CONFIG_ON)
_VideoEnabled = true; _VideoEnabled = true;
IsPlaying = false; IsPlaying = false;
@@ -237,6 +237,7 @@ namespace VocaluxeLib.Menu.SongMenu
protected CSongMenuFramework(int partyModeID) protected CSongMenuFramework(int partyModeID)
{ {
_PartyModeID = partyModeID; _PartyModeID = partyModeID;
_Video = -1;
_Theme = new SThemeSongMenu _Theme = new SThemeSongMenu
{ {
SongMenuTileBoard = SongMenuTileBoard =