comparison sub/subreader.c @ 32774:dfeea3d3b2d0

Do not add .sub to text subtitles when they look like vobsub. This will avoid the annoying message "SUB: Could not determine file format" because of MicroDVD and VOBsub sharing the same extension.

32773:06b75ec1b9c9

            // retrieve various parts of the filename
            strcpy_strip_ext_lower(tmp_fname_noext, de->d_name);
            strcpy_get_ext(tmp_fname_ext, de->d_name);
            strcpy_trim(tmp_fname_trim, tmp_fname_noext);

            // does it end with a subtitle extension?
            found = 0;
#ifdef CONFIG_ICONV
#ifdef CONFIG_ENCA
            for (i = ((sub_cp && strncasecmp(sub_cp, "enca", 4) != 0) ? 3 : 0); sub_exts[i]; i++) {

32774:dfeea3d3b2d0

            // retrieve various parts of the filename
            strcpy_strip_ext_lower(tmp_fname_noext, de->d_name);
            strcpy_get_ext(tmp_fname_ext, de->d_name);
            strcpy_trim(tmp_fname_trim, tmp_fname_noext);

            // If it's a .sub, check if there is a .idx with the same name. If
            // there is one, it's certainly a vobsub so we skip it.
            if (strcasecmp(tmp_fname_ext, "sub") == 0) {
                char *idx, *idxname = strdup(de->d_name);

                strcpy(idxname + strlen(de->d_name) - sizeof("idx") + 1, "idx");
                idx = mp_dir_join(path, idxname);
                free(idxname);
                f = fopen(idx, "rt");
                free(idx);
                if (f) {
                    fclose(f);
                    continue;
                }
            }

            // does it end with a subtitle extension?
            found = 0;
#ifdef CONFIG_ICONV
#ifdef CONFIG_ENCA
            for (i = ((sub_cp && strncasecmp(sub_cp, "enca", 4) != 0) ? 3 : 0); sub_exts[i]; i++) {