[haiku-commits] haiku: hrev48228 - src/apps/codycam
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 5 Nov 2014 16:16:31 +0100 (CET)
hrev48228 adds 1 changeset to branch 'master'
old head: b3b96925f5ef51c66eec176a9a5b9261eca0e4f0
new head: 6f3ad852a3f58dff7bf2fd34788f4b41c3973f02
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=6f3ad85+%5Eb3b9692
----------------------------------------------------------------------------
6f3ad85: CodyCam: Fix gcc4 build.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48228
Commit: 6f3ad852a3f58dff7bf2fd34788f4b41c3973f02
URL: http://cgit.haiku-os.org/haiku/commit/?id=6f3ad85
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Wed Nov 5 15:16:16 2014 UTC
----------------------------------------------------------------------------
1 file changed, 12 insertions(+), 13 deletions(-)
src/apps/codycam/CodyCam.cpp | 25 ++++++++++++-------------
----------------------------------------------------------------------------
diff --git a/src/apps/codycam/CodyCam.cpp b/src/apps/codycam/CodyCam.cpp
index 214f93b..895eca2 100644
--- a/src/apps/codycam/CodyCam.cpp
+++ b/src/apps/codycam/CodyCam.cpp
@@ -55,17 +55,6 @@ const int32 kSliderViewRectHeight = 40;
namespace {
-void
-VideoWindow::ErrorAlert(const char* message, status_t err)
-{
- Lock();
- fVideoView->SetText(message);
- Unlock();
-
- printf("%s\n%s [%" B_PRIx32 "]", message, strerror(err), err);
-}
-
-
// functions for EnumeratedStringValueSettings
const char*
@@ -493,7 +482,6 @@ VideoWindow::VideoWindow(BRect frame, const char* title,
window_type type,
}
-
VideoWindow::~VideoWindow()
{
_QuitSettings();
@@ -684,7 +672,7 @@ VideoWindow::_BuildCaptureControls()
m->AddInt32("client", i);
fUploadClientMenu->AddItem(new BMenuItem(kUploadClients[i], m));
}
-
+
fUploadClientMenu->SetTargetForItems(this);
fUploadClientMenu->FindItem(fUploadClientSetting->Value())->SetMarked(true);
fUploadClientSelector = new BMenuField("UploadClient", NULL,
@@ -755,6 +743,17 @@ VideoWindow::ApplyControls()
void
+VideoWindow::ErrorAlert(const char* message, status_t err)
+{
+ Lock();
+ fVideoView->SetText(message);
+ Unlock();
+
+ printf("%s\n%s [%" B_PRIx32 "]", message, strerror(err), err);
+}
+
+
+void
VideoWindow::_SetUpSettings(const char* filename, const char* dirname)
{
fSettings = new Settings(filename, dirname);
Other related posts:
- » [haiku-commits] haiku: hrev48228 - src/apps/codycam - pulkomandy
