Author: jerome
Date: 2009-04-10 12:12:10 +0200 (Fri, 10 Apr 2009)
New Revision: 4456
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
Log:
* Improved now playing function.
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
2009-04-10 10:12:05 UTC (rev 4455)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
2009-04-10 10:12:10 UTC (rev 4456)
@@ -92,7 +92,14 @@
if(configuration.getGiveNowPlaying())
{
Program nowPlaying =
SimplePrograms.getNowPlaying(programme);
- gadget.throwMessage("Now playing {0} on {1}",
nowPlaying.getTitle(), nowPlaying.getChannel());
+ if(nowPlaying != null)
+ {
+ gadget.throwMessage("Now playing {0} on {1}",
nowPlaying.getTitle(), nowPlaying.getChannel());
+ }
+ else
+ {
+ gadget.throwMessage("No TV program for now");
+ }
}
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
2009-04-10 10:12:05 UTC (rev 4455)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
2009-04-10 10:12:10 UTC (rev 4456)
@@ -533,6 +533,7 @@
public static Program getNowPlaying(Vector<Program> program)
{
int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
+ int shour = hour;
int minutes = Calendar.getInstance().get(Calendar.MINUTE);
Program nowPlaying = null;
@@ -561,7 +562,23 @@
if(result != -1)
{
- return program.get(result);
+ nowPlaying = program.get(result);
+ int time = -1;
+ try
+ {
+ time =
Integer.valueOf(nowPlaying.getStartTime().substring(0, 2)).intValue();
+ }
+ catch(NumberFormatException error)
+ {
+ return null;
+ }
+
+ if(time > shour)
+ {
+ return null;
+ }
+
+ return nowPlaying;
}
}
}
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
