[Scummvm-cvs-logs] scummvm master -> 204644b001d85612742426b5731b8149b0a24f2e

[athrxx]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b0008d2d33 FM-TOWNS AUDIO: fix memory leak
204644b001 Merge branch 'master' of https://github.com/scummvm/scummvm


Commit: b0008d2d33c394fbba358c08b032c5872e6a909d
    https://github.com/scummvm/scummvm/commit/b0008d2d33c394fbba358c08b032c5872e6a909d
Author: athrxx (athrxx at scummvm.org)
Date: 2011-04-21T11:22:12-07:00

Commit Message:
FM-TOWNS AUDIO: fix memory leak

Changed paths:
    audio/softsynth/fmtowns_pc98/towns_euphony.cpp



diff --git a/audio/softsynth/fmtowns_pc98/towns_euphony.cpp b/audio/softsynth/fmtowns_pc98/towns_euphony.cpp
index 7c071c4..0ad96f7 100644
--- a/audio/softsynth/fmtowns_pc98/towns_euphony.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_euphony.cpp
@@ -40,6 +40,7 @@ TownsEuphonyDriver::~TownsEuphonyDriver() {
 	delete[] _activeChannels;
 	delete[] _sustainChannels;
 	delete[] _assignedChannels;
+	delete[] _eventBuffer;
 	delete[] _tEnable;
 	delete[] _tMode;
 	delete[] _tOrdr;
@@ -51,6 +52,16 @@ bool TownsEuphonyDriver::init() {
 	if (!_intf->init())
 		return false;
 
+	delete[] _activeChannels;
+	delete[] _sustainChannels;
+	delete[] _assignedChannels;
+	delete[] _eventBuffer;
+	delete[] _tEnable;
+	delete[] _tMode;
+	delete[] _tOrdr;
+	delete[] _tLevel;
+	delete[] _tTranspose;
+
 	_activeChannels = new int8[16];
 	_sustainChannels = new int8[16];
 	_assignedChannels = new ActiveChannel[128];


Commit: 204644b001d85612742426b5731b8149b0a24f2e
    https://github.com/scummvm/scummvm/commit/204644b001d85612742426b5731b8149b0a24f2e
Author: athrxx (athrxx at scummvm.org)
Date: 2011-04-21T11:29:25-07:00

Commit Message:
Merge branch 'master' of https://github.com/scummvm/scummvm

Changed paths:
  A backends/platform/dc/plugins.cpp
  R backends/plugins/dc/dc-provider.cpp
  R backends/plugins/dc/dc-provider.h
    backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp
    backends/module.mk
    backends/platform/dc/Makefile
    backends/platform/dc/dc.h
    backends/platform/dc/dcmain.cpp
    backends/platform/dc/module.mk
    backends/platform/gph/gph-backend.cpp
    backends/platform/gph/gph-sdl.h
    backends/platform/openpandora/op-backend.cpp
    backends/platform/openpandora/op-sdl.h
    backends/platform/symbian/AdaptAllMMPs.pl
    backends/platform/symbian/mmp/scummvm_base.mmp.in
    backends/platform/symbian/src/portdefs.h
    common/stream.cpp
    common/substream.h
    engines/gob/save/savefile.cpp
    engines/hugo/mouse.cpp
    engines/hugo/parser.cpp
    engines/lure/menu.cpp
    engines/mohawk/myst_stacks/selenitic.cpp
    engines/sci/engine/script.cpp
    engines/tsage/converse.cpp
    engines/tsage/core.cpp
    engines/tsage/core.h
    engines/tsage/dialogs.cpp
    engines/tsage/ringworld_scenes1.cpp
    engines/tsage/ringworld_scenes1.h
    engines/tsage/ringworld_scenes10.cpp
    engines/tsage/ringworld_scenes2.cpp
    engines/tsage/ringworld_scenes3.cpp
    engines/tsage/ringworld_scenes5.cpp
    engines/tsage/ringworld_scenes5.h
    engines/tsage/saveload.cpp
    engines/tsage/saveload.h
    engines/tsage/scenes.cpp
    engines/tsage/scenes.h