Thread: [Redbutton-devel] SF.net SVN: redbutton: [2] redbutton-browser/trunk/StreamClass.c
Brought to you by:
skilvington
Menu
▾
▴
redbutton-devel
|
From: <ski...@us...> - 2006-02-28 14:51:39
|
Revision: 2 Author: skilvington Date: 2006-02-28 06:51:25 -0800 (Tue, 28 Feb 2006) ViewCVS: http://svn.sourceforge.net/redbutton/?rev=2&view=rev Log Message: ----------- stop the player before free'ing the triggers Modified Paths: -------------- redbutton-browser/trunk/StreamClass.c Modified: redbutton-browser/trunk/StreamClass.c =================================================================== --- redbutton-browser/trunk/StreamClass.c 2006-02-28 10:43:54 UTC (rev 1) +++ redbutton-browser/trunk/StreamClass.c 2006-02-28 14:51:25 UTC (rev 2) @@ -30,10 +30,10 @@ void free_StreamClassInstanceVars(StreamClassInstanceVars *v) { + MHEGStreamPlayer_fini(&v->player); + LIST_FREE(&v->CounterTriggers, CounterTrigger, safe_free); - MHEGStreamPlayer_fini(&v->player); - return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ski...@us...> - 2007-02-08 12:09:36
|
Revision: 206
http://svn.sourceforge.net/redbutton/?rev=206&view=rev
Author: skilvington
Date: 2007-02-08 04:09:35 -0800 (Thu, 08 Feb 2007)
Log Message:
-----------
rec://svc/def resets the service ID
Modified Paths:
--------------
redbutton-browser/trunk/StreamClass.c
Modified: redbutton-browser/trunk/StreamClass.c
===================================================================
--- redbutton-browser/trunk/StreamClass.c 2007-02-08 11:55:44 UTC (rev 205)
+++ redbutton-browser/trunk/StreamClass.c 2007-02-08 12:09:35 UTC (rev 206)
@@ -110,13 +110,21 @@
{
MHEGStreamPlayer_setServiceID(&t->inst.player, si_get_service_id(service));
}
- /* leave player's service ID as it is for "cur" and "def" */
- else if(OctetString_strcmp(service, "rec://svc/cur") != 0
- && OctetString_strcmp(service, "rec://svc/def") != 0)
+ else if(OctetString_strncmp(service, "rec://svc/lcn/", 14) == 0)
{
/* TODO */
printf("TODO: StreamClass: service='%.*s'\n", service->size, service->data);
}
+ else if(OctetString_strcmp(service, "rec://svc/def") == 0)
+ {
+ /* use the service ID we are currently tuned to */
+ MHEGStreamPlayer_setServiceID(&t->inst.player, -1);
+ }
+ /* leave player's service ID as it is for "rec://svc/cur" */
+ else if(OctetString_strcmp(service, "rec://svc/cur") != 0)
+ {
+ error("StreamClass: unexpected service '%.*s'", service->size, service->data);
+ }
}
/* start playing all active StreamComponents */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ski...@us...> - 2007-02-08 14:07:34
|
Revision: 207
http://svn.sourceforge.net/redbutton/?rev=207&view=rev
Author: skilvington
Date: 2007-02-08 06:07:04 -0800 (Thu, 08 Feb 2007)
Log Message:
-----------
update default service comment
Modified Paths:
--------------
redbutton-browser/trunk/StreamClass.c
Modified: redbutton-browser/trunk/StreamClass.c
===================================================================
--- redbutton-browser/trunk/StreamClass.c 2007-02-08 12:09:35 UTC (rev 206)
+++ redbutton-browser/trunk/StreamClass.c 2007-02-08 14:07:04 UTC (rev 207)
@@ -94,7 +94,7 @@
StreamClass_Preparation(t);
}
- /* assume default is "rec://svc/def", ie current channel */
+ /* assume default is "rec://svc/cur", ie current channel */
if(t->have_original_content
&& (service = ContentBody_getReference(&t->original_content)) != NULL)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ski...@us...> - 2007-02-16 20:56:33
|
Revision: 219
http://svn.sourceforge.net/redbutton/?rev=219&view=rev
Author: skilvington
Date: 2007-02-16 12:56:28 -0800 (Fri, 16 Feb 2007)
Log Message:
-----------
play/stop StreamComponents when they are activated/deactivated
Modified Paths:
--------------
redbutton-browser/trunk/StreamClass.c
Modified: redbutton-browser/trunk/StreamClass.c
===================================================================
--- redbutton-browser/trunk/StreamClass.c 2007-02-16 12:54:40 UTC (rev 218)
+++ redbutton-browser/trunk/StreamClass.c 2007-02-16 20:56:28 UTC (rev 219)
@@ -246,47 +246,88 @@
void
StreamClass_activateVideoComponent(StreamClass *t, VideoClass *c)
{
-/* TODO */
-printf("TODO: StreamClass_activateVideoComponent (tag=%d)\n", c->component_tag);
-// basically:
-// MHEGStreamPlayer_stop(t)
-// MHEGStreamPlayer_setVideoStream(t, c) - may get the "only using last video stream" warning
-// MHEGStreamPlayer_play(t)
-// MHEGEngine_generateAstncEvent(&t->rootClass.inst.ref, EventType_stream_playing, NULL)
+ verbose("StreamClass_activateVideoComponent (tag=%d)", c->component_tag);
+ /*
+ * don't think we need to generate stream_playing/stopped events
+ * but I'm not entirely shore
+ */
+
+ /* if we are activated, stop playing while we change the component */
+ if(t->rootClass.inst.RunningStatus)
+ MHEGStreamPlayer_stop(&t->inst.player);
+
+ MHEGStreamPlayer_setVideoStream(&t->inst.player, c);
+
+ if(t->rootClass.inst.RunningStatus)
+ MHEGStreamPlayer_play(&t->inst.player);
+
return;
}
void
StreamClass_activateAudioComponent(StreamClass *t, AudioClass *c)
{
-/* TODO */
-printf("TODO: StreamClass_activateAudioComponent (tag=%d)\n", c->component_tag);
+ verbose("StreamClass_activateAudioComponent (tag=%d)", c->component_tag);
+ /*
+ * don't think we need to generate stream_playing/stopped events
+ * but I'm not entirely shore
+ */
+
+ /* if we are activated, stop playing while we change the component */
+ if(t->rootClass.inst.RunningStatus)
+ MHEGStreamPlayer_stop(&t->inst.player);
+
+ MHEGStreamPlayer_setAudioStream(&t->inst.player, c);
+
+ if(t->rootClass.inst.RunningStatus)
+ MHEGStreamPlayer_play(&t->inst.player);
+
return;
}
void
StreamClass_deactivateVideoComponent(StreamClass *t, VideoClass *c)
{
-/* TODO */
-printf("TODO: StreamClass_deactivateVideoComponent (tag=%d)\n", c->component_tag);
-// basically:
-// MHEGStreamPlayer_stop(t)
-// MHEGStreamPlayer_setVideoStream(t, NULL)
-// MHEGStreamPlayer_play(t)
-// MHEGEngine_generateAstncEvent(&t->rootClass.inst.ref, EventType_stream_stopped, NULL)
-// => need to make MHEGStreamPlayer_setVideoStream(t, NULL) disable video
+ verbose("StreamClass_deactivateVideoComponent (tag=%d)", c->component_tag);
+ /*
+ * don't think we need to generate stream_playing/stopped events
+ * but I'm not entirely shore
+ */
+
+ /* if we are activated, stop playing while we change the component */
+ if(t->rootClass.inst.RunningStatus)
+ MHEGStreamPlayer_stop(&t->inst.player);
+
+ MHEGStreamPlayer_setVideoStream(&t->inst.player, NULL);
+
+ if(t->rootClass.inst.RunningStatus)
+ MHEGStreamPlayer_play(&t->inst.player);
+
return;
}
void
StreamClass_deactivateAudioComponent(StreamClass *t, AudioClass *c)
{
-/* TODO */
-printf("TODO: StreamClass_deactivateAudioComponent (tag=%d)\n", c->component_tag);
+ verbose("StreamClass_deactivateAudioComponent (tag=%d)", c->component_tag);
+ /*
+ * don't think we need to generate stream_playing/stopped events
+ * but I'm not entirely shore
+ */
+
+ /* if we are activated, stop playing while we change the component */
+ if(t->rootClass.inst.RunningStatus)
+ MHEGStreamPlayer_stop(&t->inst.player);
+
+ MHEGStreamPlayer_setAudioStream(&t->inst.player, NULL);
+
+ if(t->rootClass.inst.RunningStatus)
+ MHEGStreamPlayer_play(&t->inst.player);
+
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ski...@us...> - 2007-02-17 17:54:05
|
Revision: 222
http://svn.sourceforge.net/redbutton/?rev=222&view=rev
Author: skilvington
Date: 2007-02-17 09:53:59 -0800 (Sat, 17 Feb 2007)
Log Message:
-----------
didn't think it looked right
Modified Paths:
--------------
redbutton-browser/trunk/StreamClass.c
Modified: redbutton-browser/trunk/StreamClass.c
===================================================================
--- redbutton-browser/trunk/StreamClass.c 2007-02-16 21:58:40 UTC (rev 221)
+++ redbutton-browser/trunk/StreamClass.c 2007-02-17 17:53:59 UTC (rev 222)
@@ -250,7 +250,7 @@
/*
* don't think we need to generate stream_playing/stopped events
- * but I'm not entirely shore
+ * but I'm not entirely sure
*/
/* if we are activated, stop playing while we change the component */
@@ -272,7 +272,7 @@
/*
* don't think we need to generate stream_playing/stopped events
- * but I'm not entirely shore
+ * but I'm not entirely sure
*/
/* if we are activated, stop playing while we change the component */
@@ -294,7 +294,7 @@
/*
* don't think we need to generate stream_playing/stopped events
- * but I'm not entirely shore
+ * but I'm not entirely sure
*/
/* if we are activated, stop playing while we change the component */
@@ -316,7 +316,7 @@
/*
* don't think we need to generate stream_playing/stopped events
- * but I'm not entirely shore
+ * but I'm not entirely sure
*/
/* if we are activated, stop playing while we change the component */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ski...@us...> - 2007-04-13 22:14:12
|
Revision: 285
http://svn.sourceforge.net/redbutton/?rev=285&view=rev
Author: skilvington
Date: 2007-04-13 15:14:11 -0700 (Fri, 13 Apr 2007)
Log Message:
-----------
how to do it
Modified Paths:
--------------
redbutton-browser/trunk/StreamClass.c
Modified: redbutton-browser/trunk/StreamClass.c
===================================================================
--- redbutton-browser/trunk/StreamClass.c 2007-04-13 14:45:39 UTC (rev 284)
+++ redbutton-browser/trunk/StreamClass.c 2007-04-13 22:14:11 UTC (rev 285)
@@ -348,6 +348,8 @@
/* TODO */
printf("TODO: StreamClass_SetData not yet implemented\n");
+// MHEGEngine_setRecSvcCur(...)
+
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X