From eba89a47264b7c81d6248cdad8d03a57718979a5 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Wed, 18 Jan 2006 19:06:58 +0000
Subject: - fix first image was'nt rotation depends founded exif data - fix
 show vdr info screen via official vdr way

---
 exif.c | 41 +++++++----------------------------------
 1 file changed, 7 insertions(+), 34 deletions(-)

(limited to 'exif.c')

diff --git a/exif.c b/exif.c
index 1149e68..b326896 100644
--- a/exif.c
+++ b/exif.c
@@ -105,11 +105,11 @@ cImageMenuExif::cImageMenuExif(const char *szFileName)
   }
 
   m_strText = o.str();
+
   SetHelp(NULL, NULL, NULL, tr("Back"));
   Display();
 }
 
-
 eOSState cImageMenuExif::ProcessKey(eKeys nKey)
 {
   switch (nKey) {
@@ -146,40 +146,13 @@ void cImageMenuExif::Display(void)
   DisplayMenu()->SetText(m_strText.c_str(),true);
 }
 
-//////////////////////////////////////////////////////////////////////////////
-/** Handle a Key stroke on exifmenu
-@return eOSState
-@param eKeys Key - the processed Keycode
-*/
-eOSState cImageControl::ProcessKeyExif(eKeys nKey)
+
+cOsdObject *cImageControl::GetInfo(void)
 {
-  if(m_pExifMenu)
-  {
-    eOSState eOSRet = m_pExifMenu->ProcessKey(nKey);
-    switch(eOSRet)
-    {
-      case osEnd:
-      case osBack:
-        delete m_pExifMenu;
-        m_pExifMenu = NULL;
-        return osContinue;
-      default:
-        return eOSRet;
-    }
-  }
-  else
-  {
-    if(!CheckAccess()) {
-      OSD_ErrorNumMsg(errno,tr("Operation failed"));
-      return osContinue;
-    }
-  
-    Hide();
-    
-    m_pExifMenu = new cImageMenuExif(FileName());
-  
-    return osContinue;
-  }
+  const char* szFile = FileName();
+  if(szFile)
+    return new cImageMenuExif(szFile);
+  return NULL;
 }
 
 //////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3