@@ -1,4 +1,23 @@

 -------------------------------------------------------------------

+Mon Dec 17 17:37:47 CST 2012 - hillwood@linuxfans.org

+

+- update to 2.0git20121115, see more at http://goo.gl/mIk8b

+- fix mplayer2 command

+

+-------------------------------------------------------------------

+Sat Oct  6 23:13:11 CST 2012 - hillwood@linuxfans.org

+

+- Update to 1.0.2git20120911

+* Add new subtitles functions

+  Subtitles Search

+  Subtitle Selection

+  Subtitles manually load

+  Subtitles resizing

+  Subtitle synchronization functions

+  Subtitles progress trim

+- Fix desktop Categories

+

+-------------------------------------------------------------------

 Tue Sep  4 21:56:11 CST 2012 - hillwood@linuxfans.org

 - Initial package 1.0git20120817

​

@@ -18,7 +18,7 @@

 Name:           deepin-media-player

 Summary:        Deepin Media Playe 

-Version:        1.0git20120817

+Version:        2.0git20121115

 Release:        1

 License:        GPL-3.0

 BuildArch:      noarch

@@ -27,6 +27,7 @@

 Source0:        %{name}-%{version}.tar.gz

 Source1:        deepin-media-player.desktop

 Source2:        deepin-media-player.png

+Patch0:         deepin-media-player-fix-mplayer2.patch

 BuildRequires:  update-desktop-files

 BuildRequires:  python-devel

 BuildRequires:  fdupes 

@@ -51,6 +52,7 @@

 %prep

 %setup -q 

+%patch0 -p1

 %build

 chmod 644 AUTHORS

​

@@ -0,0 +1,48 @@

+diff -Nur deepin-media-player-2.0git20121115/src/mplayer.py deepin-media-player-2.0git20121115-new/src/mplayer.py

+--- deepin-media-player-2.0git20121115/src/mplayer.py  2012-11-15 14:06:06.000000000 +0800

++++ deepin-media-player-2.0git20121115-new/src/mplayer.py  2012-12-17 16:28:02.000000000 +0800

+@@ -72,7 +72,7 @@

+ # Get play file length.

+ def get_length(file_path):

+     '''Get media player length.'''

+-    cmd = "mplayer -vo null -ao null -frames 0 -identify '%s'" % (file_path)

++    cmd = "mplayer2 -vo null -ao null -frames 0 -identify '%s'" % (file_path)

+     fp = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)

+     cmd_str = fp.communicate()[0]

+     length_compile = re.compile(r"ID_LENGTH=([\d|\.]+)")

+@@ -85,7 +85,7 @@

+ def get_vide_width_height(file_path):

+     try:

+         if is_valid_video_file(file_path):

+-            cmd = "mplayer -vo null -ao null -frames 0 -identify '%s' 2>&1" % (file_path)

++            cmd = "mplayer2 -vo null -ao null -frames 0 -identify '%s' 2>&1" % (file_path)

+             fp = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)    

+             cmd_str = fp.communicate()[0]

+             length_compile = re.compile(r"VIDEO:.+") 

+@@ -326,7 +326,7 @@

+         if not (self.state): # STOPING_STATE

+             self.lenState = 1 

+             # -input file.. streme player.

+-            command = ['mplayer',

++            command = ['mplayer2',

+                        '-vo',

+                        'gl,2,x11,xv',

+                        '-zoom',

+@@ -777,7 +777,7 @@

+         

+         if self.state == STARTING_STATE:

+             # scrot image.

+-            scrot_command = "cd ~/.config/deepin-media-player/buffer/ && mplayer -ss %s -noframedrop -nosound -vo png -frames 1 '%s' >/dev/null 2>&1" % (scrot_pos, self.path)

++            scrot_command = "cd ~/.config/deepin-media-player/buffer/ && mplayer2 -ss %s -noframedrop -nosound -vo png -frames 1 '%s' >/dev/null 2>&1" % (scrot_pos, self.path)

+             os.system(scrot_command)

+             # modify image name or get image file.

+             save_image_path = get_home_path() + "/.config/deepin-media-player/buffer/"        # save image buffer dir.

+@@ -805,7 +805,7 @@

+             

+         if self.state == STARTING_STATE:

+             # scrot image.

+-            os.system("cd /tmp/buffer/ && mplayer -ss %s -noframedrop -nosound -vo png -frames 1 '%s' >/dev/null 2>&1" % (scrot_pos, self.path))

++            os.system("cd /tmp/buffer/ && mplayer2 -ss %s -noframedrop -nosound -vo png -frames 1 '%s' >/dev/null 2>&1" % (scrot_pos, self.path))

+             # modify image name or get image file.

+             save_image_path = "/tmp/buffer/"        # save preview image buffer dir.    

+             image_list = os.listdir(save_image_path) # get dir all image.

​

@@ -7,5 +7,5 @@

 Exec=deepin-media-player %U

 Icon=/usr/share/icons/deepin-media-player.png

 Type=Application

-Categories=AudioVideo;Player;GTK;

+Categories=AudioVideo;Video;Player;GTK;

 MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora;

​