Merge lp:~artem-anufrij/vocal/vocal into lp:vocal

[Artem Anufrij]

[Artem Anufrij (artem-anufrij)]

Before:
https://launchpadlibrarian.net/201074671/before.png

After:
https://launchpadlibrarian.net/201074674/after.png

=== modified file 'src/Vocal.vala'
--- src/Vocal.vala	2015-02-14 01:49:28 +0000
+++ src/Vocal.vala	2015-03-23 23:26:33 +0000
@@ -20,7 +20,7 @@
 using Gtk;
 using Granite;
 using Granite.Services;
-using Notify;
+//using Notify;
 
 namespace Vocal {
 
@@ -28,32 +28,32 @@
 		private static bool OPEN_HIDDEN = false;
 		private static bool PRINT_VERSION = false;
 	}
-    
+
     public class VocalApp : Granite.Application {
-        
+
         private MainWindow window = null;
         public string[] args;
-        
+
         construct {
             program_name = "Vocal";
             exec_name = "vocal";
-            
+
             build_data_dir = Constants.DATADIR;
             build_pkg_data_dir = Constants.PKGDATADIR;
             build_release_name = Constants.RELEASE_NAME;
             build_version = Constants.VERSION;
             build_version_info = Constants.VERSION_INFO;
-            
+
             app_years = "2014";
             app_icon = "vocal";
             app_launcher = "vocal.desktop";
             application_id = "net.launchpad.vocal";
-            
+
             main_url = "https://code.launchpad.net/vocal";
             bug_url = "https://bugs.launchpad.net/vocal";
             help_url = "https://code.launchpad.net/vocal";
             translate_url = "https://translations.launchpad.net/vocal";
-            
+
             about_authors = { "Nathan Dyer <[e-mail]>" };
             about_documenters = { "Nathan Dyer <[e-mail]>" };
             about_artists = { "Nathan Dyer (App) <[e-mail]>", "Harvey Cabaguio (Icons and Branding) <[e-mail]", "Mashnoon Ibtesum (Artwork)" };
@@ -68,19 +68,19 @@
             { "hidden", 'h', 0, OptionArg.NONE, out Option.OPEN_HIDDEN, "Open without displaying the window so podcasts will continue to update", null },
             { null }
         };
-        
-        
+
+
         public VocalApp () {
             Logger.initialize ("Vocal");
-            Logger.DisplayLevel = LogLevel.INFO;   
+            Logger.DisplayLevel = LogLevel.INFO;
         }
-        
+
         public override void activate () {
-        
+
             // Set Vocal to use the dark theme (if available)
-            var settings = Gtk.Settings.get_default(); 
-            settings.gtk_application_prefer_dark_theme = true; 
-            
+            var settings = Gtk.Settings.get_default();
+            settings.gtk_application_prefer_dark_theme = true;
+
             if (get_windows () == null) {
                 window = new MainWindow (this, Option.OPEN_HIDDEN);
                 if(!Option.OPEN_HIDDEN)
@@ -89,7 +89,7 @@
                 window.present ();
             }
         }
-        
+
         public static void main (string [] args) {
             X.init_threads ();
 
@@ -136,7 +136,7 @@
             // Set the media role
             GLib.Environ.set_variable ({"PULSE_PROP_media.role"}, "audio", "true");
 
-        
+
             var app = new Vocal.VocalApp ();
             app.args = args;
             app.run (args);

=== modified file 'src/Widgets/CoverArt.vala'
--- src/Widgets/CoverArt.vala	2015-03-11 03:43:56 +0000
+++ src/Widgets/CoverArt.vala	2015-03-23 23:26:33 +0000
@@ -15,6 +15,8 @@
   with this program.  If not, see <http://www.gnu.org/licenses>
 
   END LICENSE
+
+  Authored by:    Artem Anufrij <[e-mail]>
 ***/
 
 
@@ -25,7 +27,9 @@
 namespace Vocal {
 
 	public class CoverArt : Gtk.Box {
-		
+
+        private const int COVER_SIZE = 150;
+
 		private Gtk.Image 	image;					// The actual coverart image
 		private Gtk.Image 	triangle;				// The banner in the top right corner
 		private Gtk.Overlay triangle_overlay;		// Overlays the banner on top of the image
@@ -52,9 +56,10 @@
 					info("Coverart at %s doesn't exist.".printf(path.replace("%27", "'")));
 				}
 	            InputStream input_stream = cover_file.read();
-	            var coverart_pixbuf = new Gdk.Pixbuf.from_stream_at_scale(input_stream, 150, 150, true);
-	            image = new Gtk.Image.from_pixbuf(coverart_pixbuf);     
-   
+	            var coverart_pixbuf = create_cover_image (input_stream);
+
+	            image = new Gtk.Image.from_pixbuf(coverart_pixbuf);
+
 	            // Load the banner to be drawn on top of the cover art
 				File triangle_file = GLib.File.new_for_uri("""file:///usr/share/vocal/banner.png""");
 	            InputStream triangle_input_stream = triangle_file.read();
@@ -93,7 +98,7 @@
 				this.tooltip_text = podcast.name.replace("%27", "'");
 
 				// Set up the overlays
-				
+
 				count_overlay.add_overlay(count_label);
 				triangle_overlay.add_overlay(count_overlay);
 
@@ -113,7 +118,7 @@
 					Gtk.Image mime_image;
 					if(podcast.content_type == MediaType.AUDIO)
 						mime_image = new Gtk.Image.from_icon_name ("media-audio-symbolic", IconSize.BUTTON);
-					else 
+					else
 						mime_image = new Gtk.Image.from_icon_name ("media-video-symbolic", IconSize.BUTTON);
 
 string css = """
@@ -176,5 +181,31 @@
 			triangle.set_no_show_all(false);
 			triangle.show();
 		}
+
+        public Gdk.Pixbuf create_cover_image (InputStream input_stream) {
+            var cover_image = new Gdk.Pixbuf.from_stream (input_stream);
+
+            if (cover_image.height == cover_image.width)
+                cover_image = cover_image.scale_simple (COVER_SIZE, COVER_SIZE, Gdk.InterpType.BILINEAR);
+
+            if (cover_image.height > cover_image.width) {
+
+                int new_height = COVER_SIZE * cover_image.height / cover_image.width;
+                int new_width = COVER_SIZE;
+                int offset = (new_height - new_width) / 2;
+
+                cover_image = new Gdk.Pixbuf.subpixbuf(cover_image.scale_simple (new_width, new_height, Gdk.InterpType.BILINEAR), 0, offset, COVER_SIZE, COVER_SIZE);
+
+            } else if (cover_image.height < cover_image.width) {
+
+                int new_height = COVER_SIZE;
+                int new_width = COVER_SIZE * cover_image.width / cover_image.height;
+                int offset = (new_width - new_height) / 2;
+
+                cover_image = new Gdk.Pixbuf.subpixbuf(cover_image.scale_simple (new_width, new_height, Gdk.InterpType.BILINEAR), offset, 0, COVER_SIZE, COVER_SIZE);
+            }
+
+            return cover_image;
+        }
 	}
-}
\ No newline at end of file
+}