From: jstebbins <jstebbins.hb@gmail.com>
Date: Thu, 21 Jun 2012 18:31:30 +0000 (+0000)
Subject: LinGui: bugfix branch, disable status icon progress when status icon is disabled
X-Git-Tag: 0.9.6.1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4501ca6f68b68696787602bf80383101b12be485;p=handbrake

LinGui: bugfix branch, disable status icon progress when status icon is disabled


git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.9.x@4764 b64f7644-9d1e-0410-96f1-a4d463321fa5
---

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index d1b11484d..5020942b1 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -2846,19 +2846,22 @@ ghb_backend_events(signal_user_data_t *ud)
 		status_str = searching_status_string(ud, &status.queue);
 		label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
 		gtk_label_set_text (label, status_str);
+		if (ghb_settings_get_boolean(ud->settings, "show_status"))
+		{
 #if !GTK_CHECK_VERSION(2, 16, 0)
-		GtkStatusIcon *si;
+			GtkStatusIcon *si;
 
-		si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
-		gtk_status_icon_set_tooltip(si, status_str);
+			si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+			gtk_status_icon_set_tooltip(si, status_str);
 #endif
 #if defined(_USE_APP_IND)
-		char * ai_status_str= g_strdup_printf(
-			"%.2f%%",
-			100.0 * status.queue.progress);
-		app_indicator_set_label( ud->ai, ai_status_str, "99.99%");
-		g_free(ai_status_str);
+			char * ai_status_str= g_strdup_printf(
+				"%.2f%%",
+				100.0 * status.queue.progress);
+			app_indicator_set_label( ud->ai, ai_status_str, "99.99%");
+			g_free(ai_status_str);
 #endif
+		}
 		gtk_label_set_text (work_status, status_str);
 		gtk_progress_bar_set_fraction (progress, status.queue.progress);
 		g_free(status_str);
@@ -2891,20 +2894,23 @@ ghb_backend_events(signal_user_data_t *ud)
 		status_str = working_status_string(ud, &status.queue);
 		label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
 		gtk_label_set_text (label, status_str);
+		if (ghb_settings_get_boolean(ud->settings, "show_status"))
+		{
 #if defined(_USE_APP_IND)
-		char * ai_status_str= g_strdup_printf(
-			"%.2f%%",
-			100.0 * status.queue.progress);
-		app_indicator_set_label( ud->ai, ai_status_str, "99.99%");
-		g_free(ai_status_str);
+			char * ai_status_str= g_strdup_printf(
+				"%.2f%%",
+				100.0 * status.queue.progress);
+			app_indicator_set_label( ud->ai, ai_status_str, "99.99%");
+			g_free(ai_status_str);
 #else
 #if !GTK_CHECK_VERSION(2, 16, 0)
-		GtkStatusIcon *si;
+			GtkStatusIcon *si;
 
-		si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
-		gtk_status_icon_set_tooltip(si, status_str);
+			si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+			gtk_status_icon_set_tooltip(si, status_str);
 #endif
 #endif
+		}
 		gtk_label_set_text (work_status, status_str);
 		gtk_progress_bar_set_fraction (progress, status.queue.progress);
 		g_free(status_str);
diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
index f0d375685..c12414b87 100644
--- a/libhb/decavcodec.c
+++ b/libhb/decavcodec.c
@@ -38,7 +38,9 @@
 #include "hb.h"
 #include "hbffmpeg.h"
 #include "downmix.h"
-#include "libavcodec/audioconvert.h"
+
+struct AVAudioConvert;
+typedef struct AVAudioConvert AVAudioConvert;
 
 static void compute_frame_duration( hb_work_private_t *pv );
 static void flushDelayQueue( hb_work_private_t *pv );
diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c
index 3a23256fa..dad8fa141 100644
--- a/libhb/encavcodecaudio.c
+++ b/libhb/encavcodecaudio.c
@@ -7,7 +7,9 @@
 #include "hb.h"
 #include "hbffmpeg.h"
 #include "downmix.h"
-#include "libavcodec/audioconvert.h"
+
+struct AVAudioConvert;
+typedef struct AVAudioConvert AVAudioConvert;
 
 struct hb_work_private_s
 {