[MPlayer-cvslog] r37512 - in branches/1.2: . gui/interface.h gui/ui/actions.c

[ib]

Author: ib
Date: Tue Sep  8 23:02:20 2015
New Revision: 37512

Log:
Merge r37496 from trunk:

Extend the guiInterface_t structure.

Modified:
   branches/1.2/   (props changed)
   branches/1.2/gui/interface.h
   branches/1.2/gui/ui/actions.c

Modified: branches/1.2/gui/interface.h
==============================================================================
--- branches/1.2/gui/interface.h	Tue Sep  8 23:02:17 2015	(r37511)
+++ branches/1.2/gui/interface.h	Tue Sep  8 23:02:20 2015	(r37512)
@@ -119,6 +119,7 @@ typedef struct {
     stream_language_t Subtitle[32];
 
     char *Filename;           // public, read access by MPlayer
+    char *Title;
     char *AudioFilename;
     char *SubtitleFilename;
     char *ImageFilename;
@@ -141,6 +142,9 @@ typedef struct {
 
     int MediumChanged;        // public, read access by MPlayer
     int PlaylistNext;
+
+    int Start;
+    int Stop;
 } guiInterface_t;
 
 extern guiInterface_t guiInfo;

Modified: branches/1.2/gui/ui/actions.c
==============================================================================
--- branches/1.2/gui/ui/actions.c	Tue Sep  8 23:02:17 2015	(r37511)
+++ branches/1.2/gui/ui/actions.c	Tue Sep  8 23:02:20 2015	(r37512)
@@ -756,6 +756,8 @@ void uiUnsetMedia(int totals)
     guiInfo.AudioChannels    = 0;
     guiInfo.AudioPassthrough = False;
     guiInfo.RunningTime      = 0;
+    guiInfo.Start = 0;
+    guiInfo.Stop  = 0;
 
     if (totals) {
         guiInfo.Chapters = 0;
@@ -769,6 +771,7 @@ void uiUnsetMedia(int totals)
     }
 
     nfree(guiInfo.CodecName);
+    nfree(guiInfo.Title);
     nfree(guiInfo.AudioFilename);
     nfree(guiInfo.SubtitleFilename);
     nfree(guiInfo.ImageFilename);