Thread: [Mplayerplug-in-cvs] mplayerplug-in/Source plugin-support.cpp, 1.100, 1.101 plugin-threads.cpp, 1.2
Brought to you by:
kdekorte
From: Kevin D. <kde...@us...> - 2006-09-11 16:36:07
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26749/Source Modified Files: plugin-support.cpp plugin-threads.cpp Log Message: Make tv:// be recognized as a streaming type of URL Reorganize tv patch Index: plugin-threads.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v retrieving revision 1.248 retrieving revision 1.249 diff -C2 -d -r1.248 -r1.249 *** plugin-threads.cpp 11 Sep 2006 16:09:24 -0000 1.248 --- plugin-threads.cpp 11 Sep 2006 16:35:57 -0000 1.249 *************** *** 568,606 **** } - if (instance->tv_driver) { - snprintf(buffer, 1024, "-tv:driver"); - instance->td->argv[i++] = strdup(buffer); - snprintf(buffer, 1024, "%s", instance->tv_driver); - instance->td->argv[i++] = strdup(buffer); - } - - if (instance->tv_input) { - snprintf(buffer, 1024, "-tv:input"); - instance->td->argv[i++] = strdup(buffer); - snprintf(buffer, 1024, "%s", instance->tv_input); - instance->td->argv[i++] = strdup(buffer); - } - - if (instance->tv_width > 0) { - snprintf(buffer, 1024, "-tv:width"); - instance->td->argv[i++] = strdup(buffer); - snprintf(buffer, 1024, "%i", instance->tv_width); - instance->td->argv[i++] = strdup(buffer); - } - - if (instance->tv_height > 0) { - snprintf(buffer, 1024, "-tv:height"); - instance->td->argv[i++] = strdup(buffer); - snprintf(buffer, 1024, "%i", instance->tv_height); - instance->td->argv[i++] = strdup(buffer); - } - - if (instance->tv_outfmt) { - snprintf(buffer, 1024, "-tv:outfmt"); - instance->td->argv[i++] = strdup(buffer); - snprintf(buffer, 1024, "%s", instance->tv_outfmt); - instance->td->argv[i++] = strdup(buffer); - } - snprintf(buffer, 1024, "-osdlevel"); instance->td->argv[i++] = strdup(buffer); --- 568,571 ---- *************** *** 1921,1924 **** --- 1886,1926 ---- } + if (strcmp(local_url,"tv://") == 0) { + if (local_td->instance->tv_driver) { + snprintf(buffer, 1024, "-tv:driver"); + local_td->argv[argc++] = strdup(buffer); + snprintf(buffer, 1024, "%s", local_td->instance->tv_driver); + local_td->argv[argc++] = strdup(buffer); + } + + if (local_td->instance->tv_input) { + snprintf(buffer, 1024, "-tv:input"); + local_td->argv[argc++] = strdup(buffer); + snprintf(buffer, 1024, "%s", local_td->instance->tv_input); + local_td->argv[argc++] = strdup(buffer); + } + + if (local_td->instance->tv_width > 0) { + snprintf(buffer, 1024, "-tv:width"); + local_td->argv[argc++] = strdup(buffer); + snprintf(buffer, 1024, "%i", local_td->instance->tv_width); + local_td->argv[argc++] = strdup(buffer); + } + + if (local_td->instance->tv_height > 0) { + snprintf(buffer, 1024, "-tv:height"); + local_td->argv[argc++] = strdup(buffer); + snprintf(buffer, 1024, "%i", local_td->instance->tv_height); + local_td->argv[argc++] = strdup(buffer); + } + + if (local_td->instance->tv_outfmt) { + snprintf(buffer, 1024, "-tv:outfmt"); + local_td->argv[argc++] = strdup(buffer); + snprintf(buffer, 1024, "%s", local_td->instance->tv_outfmt); + local_td->argv[argc++] = strdup(buffer); + } + } + if (local_td->instance->starttime > 0) { local_td->argv[argc++] = strdup("-ss"); *************** *** 1936,1943 **** g_idle_add(gtkgui_updatebuttons, local_td->instance); #endif ! local_td->argv[argc++] = strdup("-cache"); ! snprintf(message, 1024, "%i", ! local_td->instance->cachesize); ! local_td->argv[argc++] = strdup(message); if (DEBUG) printf("pre local_url is %s\n",local_url); --- 1938,1947 ---- g_idle_add(gtkgui_updatebuttons, local_td->instance); #endif ! if (local_td->instance->nomediacache == 0) { ! local_td->argv[argc++] = strdup("-cache"); ! snprintf(message, 1024, "%i", ! local_td->instance->cachesize); ! local_td->argv[argc++] = strdup(message); ! } if (DEBUG) printf("pre local_url is %s\n",local_url); *************** *** 1966,1973 **** } else { if (strlen(local_list->fname) == 0) { ! local_td->argv[argc++] = strdup("-cache"); ! snprintf(message, 1024, "%i", ! local_td->instance->cachesize); ! local_td->argv[argc++] = strdup(message); if (local_list->playlist == 1 || maybeplaylist != 0) { local_td->argv[argc++] = strdup("-playlist"); --- 1970,1979 ---- } else { if (strlen(local_list->fname) == 0) { ! if (local_td->instance->nomediacache == 0) { ! local_td->argv[argc++] = strdup("-cache"); ! snprintf(message, 1024, "%i", ! local_td->instance->cachesize); ! local_td->argv[argc++] = strdup(message); ! } if (local_list->playlist == 1 || maybeplaylist != 0) { local_td->argv[argc++] = strdup("-playlist"); *************** *** 1982,1986 **** } - if (DEBUG) { printf("----player thread: URL: %s\n", local_url); --- 1988,1991 ---- Index: plugin-support.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-support.cpp,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** plugin-support.cpp 20 Aug 2006 16:52:46 -0000 1.100 --- plugin-support.cpp 11 Sep 2006 16:35:57 -0000 1.101 *************** *** 180,183 **** --- 180,184 ---- || (strncasecmp(url, "dvd://", 6) == 0) || (strncasecmp(url, "smb://", 6) == 0) + || (strncasecmp(url, "tv://", 5) == 0) || (strncasecmp(url, "rtsp://", 7) == 0)) { if (DEBUG > 1) |