[easytag] Improve FLAC file header handling
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [easytag] Improve FLAC file header handling
- Date: Tue, 21 May 2013 12:26:39 +0000 (UTC)
commit 0d54875085dab9fe541d743c7ed6546909dfaf93
Author: Abhinav <abhijangda hotmail com>
Date: Tue May 21 17:24:00 2013 +0530
Improve FLAC file header handling
Avoid checking whether the file exists before trying to read it. Remove
some unused includes.
src/flac_header.c | 19 ++-----------------
1 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/src/flac_header.c b/src/flac_header.c
index 03ca2c2..708bfeb 100644
--- a/src/flac_header.c
+++ b/src/flac_header.c
@@ -25,23 +25,18 @@
*
*/
-#include <config.h> // For definition of ENABLE_FLAC
+#include "config.h" /* For definition of ENABLE_FLAC. */
#ifdef ENABLE_FLAC
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h> // 20030519 <tmancill debian org> for compiliation on ia64 arch
#include <FLAC/all.h>
#include "easytag.h"
#include "et_core.h"
#include "flac_header.h"
-#include "log.h"
#include "misc.h"
-#include "charset.h"
/****************
@@ -84,7 +79,6 @@ static void error_callback_ (const FLAC__StreamDecoder *decoder, FLAC__StreamD
gboolean Flac_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
{
- FILE *file;
gint duration = 0;
gulong filesize;
FLAC__StreamDecoder *tmp_decoder;
@@ -93,18 +87,9 @@ gboolean Flac_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
g_return_val_if_fail (filename != NULL && ETFileInfo != NULL, FALSE);
- if ( (file=fopen(filename,"r"))==NULL )
- {
- gchar *filename_utf8 = filename_to_display(filename);
- Log_Print(LOG_ERROR,_("Error while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
- g_free(filename_utf8);
- return FALSE;
- }
- fclose(file);
-
/* Decoding FLAC file */
tmp_decoder = FLAC__stream_decoder_new();
- if (tmp_decoder == 0)
+ if (tmp_decoder == NULL)
{
return FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]