From: Daniel Caujolle-B. <f1...@us...> - 2002-12-06 19:36:49
|
Update of /cvsroot/xine/xine-ui/src/xitk In directory sc8-pr-cvs1:/tmp/cvs-serv9880 Modified Files: event.c file_browser.c kbindings.c kbindings.h Log Message: Remove filebrowser test shortcut (C-o remain). Index: event.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/event.c,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- event.c 6 Dec 2002 18:44:54 -0000 1.162 +++ event.c 6 Dec 2002 19:36:44 -0000 1.163 @@ -202,25 +202,6 @@ /* * */ -static void filebrowser_callback1(filebrowser_t *fb) { - char **files; - - printf("Current dir: %s\n", filebrowser_get_current_dir(fb)); - printf("Current file: %s\n", filebrowser_get_current_filename(fb)); - printf("Full filename: %s\n", filebrowser_get_full_filename(fb)); - files = filebrowser_get_all_files(fb); - if(files) { - int i = 0; - - while(files[i]) - printf("file %d: '%s'\n", i, files[i++]); - - i = 0; - while(files[i]) - free(files[i++]); - free(files); - } -} void gui_execute_action_id(action_id_t action) { xine_event_t xine_event; @@ -642,19 +623,6 @@ case ACTID_OSD_SINFOS: osd_stream_infos(); - break; - - case ACTID_FILEBROWSER: - { - filebrowser_callback_button_t cbb[2]; - - cbb[0].label = _("Load"); - cbb[0].callback = filebrowser_callback1; - /* cbb[1].label = _("Load all"); */ - /* cbb[1].callback = filebrowser_callback1; */ - - create_filebrowser(_("Load a playlist"), "/tmp/myfile.tox", &cbb[0], NULL); - } break; case ACTID_FILESELECTOR: Index: file_browser.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/file_browser.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- file_browser.c 6 Dec 2002 18:44:55 -0000 1.21 +++ file_browser.c 6 Dec 2002 19:36:44 -0000 1.22 @@ -411,30 +411,23 @@ xine_strdupa(_filepathname, filepathname); - printf("filepathname: %s\n", _filepathname); - if(!is_a_dir((char *)_filepathname)) filename = strrchr(_filepathname, '/'); if(filename && (strlen(filename) > 1)) { *filename++ = '\0'; - - printf("filename: %s\n", filename); sprintf(fb->filename, "%s", filename); - if(is_a_dir(_filepathname)) { + if(is_a_dir(_filepathname)) sprintf(fb->current_dir, "%s", _filepathname); - printf("new current dir: %s\n", fb->current_dir); - } + } else { - printf("don't have filename: %s\n", _filepathname); if(is_a_dir((char *)_filepathname)) { sprintf(fb->current_dir, "%s", _filepathname); memset(&fb->filename, 0, sizeof(fb->filename)); } - } } } Index: kbindings.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/kbindings.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- kbindings.c 6 Dec 2002 18:44:57 -0000 1.64 +++ kbindings.c 6 Dec 2002 19:36:44 -0000 1.65 @@ -383,8 +383,6 @@ "AddMediamark", ACTID_ADDMEDIAMARK , "a", KEYMOD_CONTROL , 0 }, { "Download a skin from the skin server.", "SkinDownload", ACTID_SKINDOWNLOAD , "d", KEYMOD_CONTROL , 0 }, - { "File Browser.", - "FileBrowser", ACTID_FILEBROWSER , "f", KEYMOD_META , 0 }, { "Open file selector.", "FileSelector", ACTID_FILESELECTOR , "o", KEYMOD_CONTROL , 0 }, { 0, Index: kbindings.h =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/kbindings.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- kbindings.h 6 Dec 2002 18:45:00 -0000 1.35 +++ kbindings.h 6 Dec 2002 19:36:45 -0000 1.36 @@ -117,7 +117,6 @@ ACTID_ADDMEDIAMARK, ACTID_SKINDOWNLOAD, ACTID_OSD_SINFOS, - ACTID_FILEBROWSER, ACTID_FILESELECTOR, /* * The below events map one-to-one with definitions in xine-lib's events.h |