Attachment #306307 for bug #409281




    /* Get size of file */
    ETFileInfo->size = Get_File_Size(filename);

    if ((file = MP4Read(filename)) == MP4_INVALID_FILE_HANDLE )
    {
        gchar *filename_utf8 = filename_to_display(filename);
        //g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));

    {
        gchar *filename_utf8 = filename_to_display(filename);
        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,("Contains no audio track"));
        MP4Close(file, 0);
        g_free(filename_utf8);
        return FALSE;
    }

    ETFileInfo->mode = MP4GetTrackAudioChannels(file, trackId);
    ETFileInfo->duration = MP4ConvertFromTrackDuration(file, trackId, MP4GetTrackDuration(file, trackId), MP4_SECS_TIME_SCALE);

    MP4Close(file, 0);
    return TRUE;
}





    fclose(file); // We close it cause mp4 opens/closes file itself

    /* Get data from tag */
    mp4file = MP4Read(filename);
    if (mp4file == MP4_INVALID_FILE_HANDLE)
    {
        gchar *filename_utf8 = filename_to_display(filename);



    /* Free allocated data */
    MP4Close(mp4file, 0);

    return TRUE;
}

    fclose(file);

    /* Open file for writing */
    mp4file = MP4Modify(filename, 0);
    if (mp4file == MP4_INVALID_FILE_HANDLE)
    {
        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,_("MP4 format invalid"));

        }
    }

    MP4Close(mp4file, 0);
    MP4Close(mp4file);

    if (error) return FALSE;
    else       return TRUE;

Return to bug 409281

Lines 204-210 Link Here

(-)easytag-2.1.7.orig/src/mp4_header.c (-3 / +3 lines)
204	/* Get size of file */	204	/* Get size of file */
205	ETFileInfo->size = Get_File_Size(filename);	205	ETFileInfo->size = Get_File_Size(filename);
206		206
207	if ((file = MP4Read(filename, 0)) == MP4_INVALID_FILE_HANDLE )	207	if ((file = MP4Read(filename)) == MP4_INVALID_FILE_HANDLE )
208	{	208	{
209	gchar *filename_utf8 = filename_to_display(filename);	209	gchar *filename_utf8 = filename_to_display(filename);
210	//g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));	210	//g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
Lines 218-224 Link Here
218	{	218	{
219	gchar *filename_utf8 = filename_to_display(filename);	219	gchar *filename_utf8 = filename_to_display(filename);
220	Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,("Contains no audio track"));	220	Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,("Contains no audio track"));
221	MP4Close(file);	221	MP4Close(file, 0);
222	g_free(filename_utf8);	222	g_free(filename_utf8);
223	return FALSE;	223	return FALSE;
224	}	224	}
Lines 243-249 Link Here
243	ETFileInfo->mode = MP4GetTrackAudioChannels(file, trackId);	243	ETFileInfo->mode = MP4GetTrackAudioChannels(file, trackId);
244	ETFileInfo->duration = MP4ConvertFromTrackDuration(file, trackId, MP4GetTrackDuration(file, trackId), MP4_SECS_TIME_SCALE);	244	ETFileInfo->duration = MP4ConvertFromTrackDuration(file, trackId, MP4GetTrackDuration(file, trackId), MP4_SECS_TIME_SCALE);
245		245
246	MP4Close(file);	246	MP4Close(file, 0);
247	return TRUE;	247	return TRUE;
248	}	248	}
249		249

Lines 102-108 Link Here

(-)easytag-2.1.7.orig/src/mp4_tag.c (-5 / +4 lines)
102	fclose(file); // We close it cause mp4 opens/closes file itself	102	fclose(file); // We close it cause mp4 opens/closes file itself
103		103
104	/* Get data from tag */	104	/* Get data from tag */
105	mp4file = MP4Read(filename, 0);	105	mp4file = MP4Read(filename);
106	if (mp4file == MP4_INVALID_FILE_HANDLE)	106	if (mp4file == MP4_INVALID_FILE_HANDLE)
107	{	107	{
108	gchar *filename_utf8 = filename_to_display(filename);	108	gchar *filename_utf8 = filename_to_display(filename);
Lines 213-219 Link Here
213		213
214		214
215	/* Free allocated data */	215	/* Free allocated data */
216	MP4Close(mp4file);	216	MP4Close(mp4file, 0);
217		217
218	return TRUE;	218	return TRUE;
219	}	219	}
Lines 252-258 Link Here
252	fclose(file);	252	fclose(file);
253		253
254	/* Open file for writing */	254	/* Open file for writing */
255	mp4file = MP4Modify(filename,0,0);	255	mp4file = MP4Modify(filename, 0);
256	if (mp4file == MP4_INVALID_FILE_HANDLE)	256	if (mp4file == MP4_INVALID_FILE_HANDLE)
257	{	257	{
258	Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,_("MP4 format invalid"));	258	Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,_("MP4 format invalid"));
Lines 434-441 Link Here
434	}	434	}
435	}	435	}
436		436
437		437	MP4Close(mp4file, 0);
438	MP4Close(mp4file);
439		438
440	if (error) return FALSE;	439	if (error) return FALSE;
441	else return TRUE;	440	else return TRUE;