Show gstreamer errors in wxGStreamerMediaBackend to the user.

[wxWidgets.git] / src / unix / fswatcher_kqueue.cpp

diff --git a/src/unix/fswatcher_kqueue.cpp b/src/unix/fswatcher_kqueue.cpp
index e1046e2ea4b3749b61913428c62fad910879d92c..5229e5139bd6b4d44a5505b7cb088190ae88dded 100644 (file)
--- a/src/unix/fswatcher_kqueue.cpp
+++ b/src/unix/fswatcher_kqueue.cpp
@@ -115,8 +115,7 @@ public:
             wxLogSysError(_("Error closing kqueue instance"));
         }
 
             wxLogSysError(_("Error closing kqueue instance"));
         }
 

-        delete m_source;
-        m_source = NULL;
+        wxDELETE(m_source);

     }
 
     virtual bool DoAdd(wxSharedPtr<wxFSWatchEntryKq> watch)
     }
 
     virtual bool DoAdd(wxSharedPtr<wxFSWatchEntryKq> watch)


@@ -298,7 +297,8 @@ protected:
         while ( nflags )
         {
             // when monitoring dir, this means create/delete
         while ( nflags )
         {
             // when monitoring dir, this means create/delete

-            if ( nflags & NOTE_WRITE && wxDirExists(w.GetPath()) )
+            const wxString basepath = w.GetPath();
+            if ( nflags & NOTE_WRITE && wxDirExists(basepath) )

             {
                 // NOTE_LINK is set when the dir was created, but we
                 // don't care - we look for new names in directory
             {
                 // NOTE_LINK is set when the dir was created, but we
                 // don't care - we look for new names in directory


@@ -309,19 +309,17 @@ protected:
                 wxArrayString changedFiles;
                 wxArrayInt changedFlags;
                 FindChanges(w, changedFiles, changedFlags);
                 wxArrayString changedFiles;
                 wxArrayInt changedFlags;
                 FindChanges(w, changedFiles, changedFlags);

+

                 wxArrayString::iterator it = changedFiles.begin();
                 wxArrayInt::iterator changeType = changedFlags.begin();
                 for ( ; it != changedFiles.end(); ++it, ++changeType )
                 {
                 wxArrayString::iterator it = changedFiles.begin();
                 wxArrayInt::iterator changeType = changedFlags.begin();
                 for ( ; it != changedFiles.end(); ++it, ++changeType )
                 {

-                    wxFileName path;
-                    if ( wxDirExists(*it) )
-                    {
-                        path = wxFileName::DirName(w.GetPath() + *it);
-                    }
-                    else
-                    {
-                        path = wxFileName::FileName(w.GetPath() + *it);
-                    }
+                    const wxString fullpath = w.GetPath() +
+                                                wxFileName::GetPathSeparator() +
+                                                  *it;
+                    const wxFileName path(wxDirExists(fullpath)
+                                            ? wxFileName::DirName(fullpath)
+                                            : wxFileName::FileName(fullpath));

 
                     wxFileSystemWatcherEvent event(*changeType, path, path);
                     SendEvent(event);
 
                     wxFileSystemWatcherEvent event(*changeType, path, path);
                     SendEvent(event);


@@ -334,28 +332,28 @@ protected:
                 // still we couldn't be sure we have the right name...
                 nflags &= ~NOTE_RENAME;
                 wxFileSystemWatcherEvent event(wxFSW_EVENT_RENAME,
                 // still we couldn't be sure we have the right name...
                 nflags &= ~NOTE_RENAME;
                 wxFileSystemWatcherEvent event(wxFSW_EVENT_RENAME,

-                                        w.GetPath(), wxFileName());
+                                        basepath, wxFileName());

                 SendEvent(event);
             }
             else if ( nflags & NOTE_WRITE || nflags & NOTE_EXTEND )
             {
                 nflags &= ~(NOTE_WRITE | NOTE_EXTEND);
                 wxFileSystemWatcherEvent event(wxFSW_EVENT_MODIFY,
                 SendEvent(event);
             }
             else if ( nflags & NOTE_WRITE || nflags & NOTE_EXTEND )
             {
                 nflags &= ~(NOTE_WRITE | NOTE_EXTEND);
                 wxFileSystemWatcherEvent event(wxFSW_EVENT_MODIFY,

-                                        w.GetPath(), w.GetPath());
+                                        basepath, basepath);

                 SendEvent(event);
             }
             else if ( nflags & NOTE_DELETE )
             {
                 nflags &= ~(NOTE_DELETE);
                 wxFileSystemWatcherEvent event(wxFSW_EVENT_DELETE,
                 SendEvent(event);
             }
             else if ( nflags & NOTE_DELETE )
             {
                 nflags &= ~(NOTE_DELETE);
                 wxFileSystemWatcherEvent event(wxFSW_EVENT_DELETE,

-                                        w.GetPath(), w.GetPath());
+                                        basepath, basepath);

                 SendEvent(event);
             }
             else if ( nflags & NOTE_ATTRIB )
             {
                 nflags &= ~(NOTE_ATTRIB);
                 wxFileSystemWatcherEvent event(wxFSW_EVENT_ACCESS,
                 SendEvent(event);
             }
             else if ( nflags & NOTE_ATTRIB )
             {
                 nflags &= ~(NOTE_ATTRIB);
                 wxFileSystemWatcherEvent event(wxFSW_EVENT_ACCESS,

-                                        w.GetPath(), w.GetPath());
+                                        basepath, basepath);

                 SendEvent(event);
             }
 
                 SendEvent(event);
             }
 


@@ -419,11 +417,7 @@ wxKqueueFileSystemWatcher::wxKqueueFileSystemWatcher(const wxFileName& path,
 {
     if (!Init())
     {
 {
     if (!Init())
     {

-        if (m_service)
-        {
-            delete m_service;
-            m_service = NULL;
-        }
+        wxDELETE(m_service);

         return;
     }
 
         return;
     }