Ticket #6497: mediaconv2.diff

src/apps/mediaconverter/MediaConverterWindow.cpp

@@ -271 +271 @@
 MediaConverterWindow::MessageReceived(BMessage* msg)
 {
     status_t status;
-    entry_ref ref;
     entry_ref inRef;
 
     BString string, string2;
 
-    // TODO: For preview, launch the default file app instead of hardcoded
-    // MediaPlayer
-    BEntry entry("/boot/system/apps/MediaPlayer", true);
     char buffer[40];
     char buffer2[B_PATH_NAME_LENGTH];
     const char* argv[3];
@@ -431 +427 @@
             break;
 
         case PREVIEW_MESSAGE:
-            entry.GetRef(&ref);
             string = "";
             string << fStartDurationTC->Text();
             string << "000";
@@ -450 +445 @@
                 argv[2] = buffer2;
             }
 
-            status = be_roster->Launch(&ref, 3, argv);
+            status = be_roster->Launch(
+                "application/x-vnd.Haiku-MediaPlayer",
+                3, (char**)argv, NULL);
 
-            if (status != B_OK) {
+            if (status != B_OK && status != B_ALREADY_RUNNING) {
                 string2 << LAUNCH_ERROR << strerror(status);
                 (new BAlert("", string2.String(), OK_LABEL))->Go();
             }
@@ -756 +753 @@
     fStartDurationTC->SetEnabled(enabled);
     fEndDurationTC->SetEnabled(enabled);
 
-    fInfoView->Update(file, _ref);
+    if (enabled)
+        fInfoView->Update(file, _ref);
 
     // HACK: get the fInfoView to update the duration "synchronously"
     UpdateIfNeeded();

src/apps/mediaconverter/MediaConverterApp.cpp

@@ -10 +10 @@
 #include <string.h>
 
 #include <Alert.h>
+#include <fs_attr.h>
 #include <MediaFile.h>
 #include <MediaTrack.h>
 #include <Mime.h>
@@ -105 +106 @@
     // from Open dialog or drag & drop
 
     while (msg->FindRef("refs", i++, &ref) == B_OK) {
+
         uint32 flags = 0; // B_MEDIA_FILE_NO_READ_AHEAD
         BMediaFile* file = new(std::nothrow) BMediaFile(&ref, flags);
+
         if (file == NULL || file->InitCheck() != B_OK) {
             errorFiles << ref.name << "\n";
             errors++;
@@ -122 +125 @@
 
     if (errors) {
         BString alertText;
-        alertText << errors << ((errors > 1) ? FILES : FILE)
+        alertText << errors << " " << ((errors > 1) ? FILES : FILE)
                 << NOTRECOGNIZE << "\n";
         alertText << errorFiles;
         BAlert* alert = new BAlert(ERROR_LOAD_STRING, alertText.String(),
@@ -175 +178 @@
 
 // #pragma mark -
 
-
 BEntry
 MediaConverterApp::_CreateOutputFile(BDirectory directory,
     entry_ref* ref, media_file_format* outputFormat)

src/apps/mediaconverter/MediaConverterApp.h

@@ -37 +37 @@
             BEntry              _CreateOutputFile(BDirectory directory,
                                     entry_ref* ref,
                                     media_file_format* outputFormat);
-    
+
     static  int32               _RunConvertEntry(void* castToMediaConverterApp);
             void                _RunConvert();
             status_t            _ConvertFile(BMediaFile* inFile,

src/apps/mediaconverter/MediaFileInfoView.cpp

@@ -151 +151 @@
 
     fMediaFile = file;
 
-    if (file != NULL && ref != NULL)
+    if (file != NULL && ref != NULL) {
         fRef = *ref;
-    else
+        status_t ret = fInfo.LoadInfo(file);
+        if (ret != B_OK) {
+            BString error("An error has occurred reading the "
+                "file info.\n\nError : ");
+            error << strerror(ret);
+            BAlert* alert = new BAlert("File Error", error.String(),
+                "OK");
+            alert->Go(NULL);
+        }
+    } else {
         fRef = entry_ref();
-
-    status_t ret = fInfo.LoadInfo(file);
-    if (ret != B_OK) {
-        BString error("An error has occurred reading the "
-            "file info.\n\nError : ");
-        error << strerror(ret);
-        BAlert* alert = new BAlert("File Error", error.String(),
-            "OK");
-        alert->Go(NULL);
     }
-
     InvalidateLayout();
     Invalidate();
 }