Ticket #3395: codycam.diff

CodyCam.cpp

@@ -744 +744 @@
     fUploadClientSelector = new BMenuField("UploadClient", NULL,
         fUploadClientMenu, NULL);
 
-    fFtpSetupBox->SetLabel("FTP");
+    fFtpSetupBox->SetLabel("Output");
     // this doesn't work with the layout manager
-//  fFtpSetupBox->SetLabel(fUploadClientSelector);
-fUploadClientSelector->SetLabel("Type:");
+    // fFtpSetupBox->SetLabel(fUploadClientSelector);
+    fUploadClientSelector->SetLabel("Type:");
 
     BGridLayout *ftpLayout = new BGridLayout(kXBuffer, 0);
     ftpLayout->SetInsets(10, 15, 5, 5);

VideoConsumer.cpp

@@ -606 +606 @@
 void
 VideoConsumer::FtpThread()
 {
+    char fullPath[B_PATH_NAME_LENGTH];
     FUNCTION("VideoConsumer::FtpThread\n");
-
-    if (LocalSave(fFileNameText, fFtpBitmap) == B_OK)
+    if (fUploadClient == 2) {
+        // 64 + 64 = 128 max
+        snprintf(fullPath, B_PATH_NAME_LENGTH, "%s/%s", fDirectoryText, fFileNameText);
+        LocalSave(fullPath, fFtpBitmap);
+    } else if (LocalSave(fFileNameText, fFtpBitmap) == B_OK)
         FtpSave(fFileNameText);
 
 #if 0
@@ -688 +692 @@
         case 1:
             ftp = new SftpClient;
             break;
+        case 2:
+            return B_OK;
         default:
             fprintf(stderr, "invalid upload client %ld\n", fUploadClient);
             return EINVAL;

CodyCam.h

@@ -81 +81 @@
 const char* kUploadClient[] = {
     "FTP",
     "SFTP",
+    "Local",
     0
 };