i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fix probable memory leaks

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27860 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Karsten Heimrich
2008-10-03 12:48:19 +00:00
parent 5ac3a15ece
commit 74fd3b540a
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/mediaplayer/playlist/PlaylistWindow.cpp
+14 -10
View File
@@ -6,7 +6,7 @@
* Stephan Aßmus <[email protected]> * Stephan Aßmus <[email protected]>
* Fredrik Modéen <[email protected]> * Fredrik Modéen <[email protected]>
*/ */
#include "PlaylistWindow.h" #include "PlaylistWindow.h"
#include <stdio.h> #include <stdio.h>
@@ -46,21 +46,22 @@ PlaylistWindow::PlaylistWindow(BRect frame, Playlist* playlist,
Controller* controller) Controller* controller)
: BWindow(frame, "Playlist", B_DOCUMENT_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, : BWindow(frame, "Playlist", B_DOCUMENT_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
B_ASYNCHRONOUS_CONTROLS) B_ASYNCHRONOUS_CONTROLS)
, fOpenPanel(NULL)
, fSavePanel(NULL)
, fLocker(new RWLocker("command stack lock")) , fLocker(new RWLocker("command stack lock"))
, fCommandStack(new CommandStack(fLocker)) , fCommandStack(new CommandStack(fLocker))
, fCommandStackListener(this) , fCommandStackListener(this)
{ {
frame = Bounds(); frame = Bounds();
_CreateMenu(frame); _CreateMenu(frame);
// will adjust frame to account for menubar // will adjust frame to account for menubar
frame.right -= B_V_SCROLL_BAR_WIDTH; frame.right -= B_V_SCROLL_BAR_WIDTH;
fListView = new PlaylistListView(frame, playlist, controller, fListView = new PlaylistListView(frame, playlist, controller,
fCommandStack); fCommandStack);
BScrollView* scrollView = new BScrollView("playlist scrollview", fListView, BScrollView* scrollView = new BScrollView("playlist scrollview", fListView,
B_FOLLOW_ALL_SIDES, 0, false, true, B_NO_BORDER); B_FOLLOW_ALL_SIDES, 0, false, true, B_NO_BORDER);
fTopView = scrollView; fTopView = scrollView;
@@ -88,6 +89,9 @@ PlaylistWindow::~PlaylistWindow()
fCommandStack->RemoveListener(&fCommandStackListener); fCommandStack->RemoveListener(&fCommandStackListener);
delete fCommandStack; delete fCommandStack;
delete fLocker; delete fLocker;
delete fOpenPanel;
delete fSavePanel;
} }
@@ -133,7 +137,7 @@ PlaylistWindow::MessageReceived(BMessage* message)
} }
break; break;
} }
case M_PLAYLIST_SAVE: case M_PLAYLIST_SAVE:
if (!fSavePanel) if (!fSavePanel)
fSavePanel = new BFilePanel(B_SAVE_PANEL); fSavePanel = new BFilePanel(B_SAVE_PANEL);
@@ -142,12 +146,12 @@ PlaylistWindow::MessageReceived(BMessage* message)
case B_SAVE_REQUESTED: case B_SAVE_REQUESTED:
printf("We are saving\n"); printf("We are saving\n");
//Use fListView and have a SaveToFile? //Use fListView and have a SaveToFile?
break; break;
case M_PLAYLIST_OPEN: case M_PLAYLIST_OPEN:
if (!fOpenPanel) if (!fOpenPanel)
fOpenPanel = new BFilePanel(B_OPEN_PANEL); fOpenPanel = new BFilePanel(B_OPEN_PANEL);
fOpenPanel->Show(); fOpenPanel->Show();
break; break;
case M_PLAYLIST_EMPTY: case M_PLAYLIST_EMPTY:
fListView->RemoveAll(); fListView->RemoveAll();
@@ -176,7 +180,7 @@ PlaylistWindow::_CreateMenu(BRect& frame)
// fileMenu->AddItem(new BMenuItem("Open"B_UTF8_ELLIPSIS, // fileMenu->AddItem(new BMenuItem("Open"B_UTF8_ELLIPSIS,
// new BMessage(M_PLAYLIST_OPEN), 'O')); // new BMessage(M_PLAYLIST_OPEN), 'O'));
// fileMenu->AddItem(new BMenuItem("Save"B_UTF8_ELLIPSIS, // fileMenu->AddItem(new BMenuItem("Save"B_UTF8_ELLIPSIS,
// new BMessage(M_PLAYLIST_SAVE), 'S')); // new BMessage(M_PLAYLIST_SAVE), 'S'));
// fileMenu->AddSeparatorItem(); // fileMenu->AddSeparatorItem();
fileMenu->AddItem(new BMenuItem("Close", fileMenu->AddItem(new BMenuItem("Close",
new BMessage(B_QUIT_REQUESTED), 'W')); new BMessage(B_QUIT_REQUESTED), 'W'));