src/playlist/loadsave.c, modules/demux/playlist/*, modules/gui/*,

[vlc] / src / misc / darwin_specific.m

diff --git a/src/misc/darwin_specific.m b/src/misc/darwin_specific.m
index 57ccab4de183508d2868e81927280d5bbb40862f..5dc48a8b473728a1f9d9f9587223bf3aa546fb94 100644 (file)
--- a/src/misc/darwin_specific.m
+++ b/src/misc/darwin_specific.m
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #include <string.h>                                              /* strdup() */
 #include <stdlib.h>                                                /* free() */
@@ -27,6 +27,7 @@
 #include <vlc/vlc.h>
 
 #include <Cocoa/Cocoa.h>
+#include <CoreFoundation/CFString.h>
 
 #ifdef HAVE_LOCALE_H
 #   include <locale.h>
@@ -49,11 +50,15 @@ static int FindLanguage( const char * psz_lang )
         "French", "fr",
         "Italian", "it",
         "Japanese", "ja",
+        "Korean", "ko",
+       "Georgian", "ka",
         "Dutch", "nl",
+       "Occitan", "oc",
         "Brazillian Portuguese", "pt_BR",
         "Romanian", "ro",
         "Russian", "ru",
         "Turkish", "tr",
+        "Simplified Chinese", "zh_CN", 
         "Chinese Traditional", "zh_TW",
         NULL
     };
@@ -114,6 +119,9 @@ void system_Init( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] )
 
         [o_pool release];
     }
+
+    vlc_mutex_init( p_this, &p_this->p_libvlc->iconv_lock );
+    p_this->p_libvlc->iconv_macosx = vlc_iconv_open( "UTF-8", "UTF-8-MAC" );
 }
 
 /*****************************************************************************
@@ -130,5 +138,9 @@ void system_Configure( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] )
 void system_End( vlc_t *p_this )
 {
     free( p_this->p_libvlc->psz_vlcpath );
+
+    if ( p_this->p_libvlc->iconv_macosx != (vlc_iconv_t)-1 )
+        vlc_iconv_close( p_this->p_libvlc->iconv_macosx );
+    vlc_mutex_destroy( &p_this->p_libvlc->iconv_lock );
 }